[interchange-cvs] interchange - heins modified 2 files

interchange-cvs at icdevgroup.org interchange-cvs at icdevgroup.org
Tue Jul 20 01:24:00 EDT 2004


User:      heins
Date:      2004-07-20 05:24:00 GMT
Modified:  lib/Vend Interpolate.pm Scan.pm
Log:
* Don't save more matches in [loop ...] unless more=1 is set.

* Fix typo causing mv_no_more to be ignored in certain circumstances.

Revision  Changes    Path
2.217     +5 -3      interchange/lib/Vend/Interpolate.pm


rev 2.217, prev_rev 2.216
Index: Interpolate.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Interpolate.pm,v
retrieving revision 2.216
retrieving revision 2.217
diff -u -r2.216 -r2.217
--- Interpolate.pm	20 Jul 2004 01:46:44 -0000	2.216
+++ Interpolate.pm	20 Jul 2004 05:23:59 -0000	2.217
@@ -1,6 +1,6 @@
 # Vend::Interpolate - Interpret Interchange tags
 # 
-# $Id: Interpolate.pm,v 2.216 2004/07/20 01:46:44 mheins Exp $
+# $Id: Interpolate.pm,v 2.217 2004/07/20 05:23:59 mheins Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -28,7 +28,7 @@
 require Exporter;
 @ISA = qw(Exporter);
 
-$VERSION = substr(q$Revision: 2.216 $, 10);
+$VERSION = substr(q$Revision: 2.217 $, 10);
 
 @EXPORT = qw (
 
@@ -4896,7 +4896,8 @@
 						};
 				my $params = escape_scan($opt->{search});
 				Vend::Scan::find_search_params($c, $params);
-				#::logDebug("perform_search");
+				$c->{mv_no_more} = ! $opt->{more};
+#::logDebug("perform_search, c=" . ::uneval($c));
 				$obj = perform_search($c);
 			}
 		}
@@ -5028,6 +5029,7 @@
 		$obj->{mv_field_hash} = $fh if $fh;
 		if($opt->{ml}) {
 			$obj->{mv_matchlimit} = $opt->{ml};
+			$obj->{mv_no_more} = ! $opt->{more};
 			$obj->{mv_first_match} = $opt->{mv_first_match} || 0;
 			$obj->{mv_next_pointer} = $opt->{mv_first_match} + $opt->{ml};
 		}



2.27      +3 -3      interchange/lib/Vend/Scan.pm


rev 2.27, prev_rev 2.26
Index: Scan.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/Scan.pm,v
retrieving revision 2.26
retrieving revision 2.27
diff -u -r2.26 -r2.27
--- Scan.pm	19 Jul 2004 22:26:00 -0000	2.26
+++ Scan.pm	20 Jul 2004 05:24:00 -0000	2.27
@@ -1,6 +1,6 @@
 # Vend::Scan - Prepare searches for Interchange
 #
-# $Id: Scan.pm,v 2.26 2004/07/19 22:26:00 mheins Exp $
+# $Id: Scan.pm,v 2.27 2004/07/20 05:24:00 mheins Exp $
 #
 # Copyright (C) 2002-2003 Interchange Development Group
 # Copyright (C) 1996-2002 Red Hat, Inc.
@@ -30,7 +30,7 @@
 			perform_search
 			);
 
-$VERSION = substr(q$Revision: 2.26 $, 10);
+$VERSION = substr(q$Revision: 2.27 $, 10);
 
 use strict;
 use Vend::Util;
@@ -107,7 +107,7 @@
 	mv_unique
 	mv_more_matches
 	mv_value
-	mv_mo_more
+	mv_no_more
 	mv_next_search
 	mv_search_reference
 	prefix








More information about the interchange-cvs mailing list