[interchange-cvs] interchange - edl modified 2 files

[interchange-core@interchange.redhat.com]

User:      edl
Date:      2002-06-22 22:38:38 GMT
Modified:  lib/Vend DbSearch.pm TextSearch.pm
Log:
Oops! Should not have removed that first $s->{matches} assignment, could
have led to some breakage.

Revision  Changes    Path
2.12      +4 -2      interchange/lib/Vend/DbSearch.pm


rev 2.12, prev_rev 2.11
Index: DbSearch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/DbSearch.pm,v
retrieving revision 2.11
retrieving revision 2.12
diff -u -r2.11 -r2.12
--- DbSearch.pm	22 Jun 2002 22:30:22 -0000	2.11
+++ DbSearch.pm	22 Jun 2002 22:38:38 -0000	2.12
@@ -1,6 +1,6 @@
 # Vend::DbSearch - Search indexes with Interchange
 #
-# $Id: DbSearch.pm,v 2.11 2002/06/22 22:30:22 edl Exp $
+# $Id: DbSearch.pm,v 2.12 2002/06/22 22:38:38 edl Exp $
 #
 # Adapted for use with Interchange from Search::TextSearch
 #
@@ -26,7 +26,7 @@
 
 @ISA = qw(Vend::Search);
 
-$VERSION = substr(q$Revision: 2.11 $, 10);
+$VERSION = substr(q$Revision: 2.12 $, 10);
 
 use Search::Dict;
 use strict;
@@ -296,6 +296,8 @@
 		@out = $s->search_reference(\@out);
 #::logDebug("did next_search: " . ::uneval(\@out));
 	}
+
+	$s->{matches} = scalar(@out);
 
 #::logDebug("before delayed return: self=" . ::Vend::Util::uneval_it({%$s}));
 



2.8       +4 -2      interchange/lib/Vend/TextSearch.pm


rev 2.8, prev_rev 2.7
Index: TextSearch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/TextSearch.pm,v
retrieving revision 2.7
retrieving revision 2.8
diff -u -r2.7 -r2.8
--- TextSearch.pm	22 Jun 2002 22:30:22 -0000	2.7
+++ TextSearch.pm	22 Jun 2002 22:38:38 -0000	2.8
@@ -1,6 +1,6 @@
 # Vend::TextSearch - Search indexes with Perl
 #
-# $Id: TextSearch.pm,v 2.7 2002/06/22 22:30:22 edl Exp $
+# $Id: TextSearch.pm,v 2.8 2002/06/22 22:38:38 edl Exp $
 #
 # Adapted for use with Interchange from Search::TextSearch
 #
@@ -28,7 +28,7 @@
 use vars qw(@ISA);
 @ISA = qw(Vend::Search);
 
-$VERSION = substr(q$Revision: 2.7 $, 10);
+$VERSION = substr(q$Revision: 2.8 $, 10);
 
 use Search::Dict;
 use strict;
@@ -321,6 +321,8 @@
 		@out = $s->search_reference(\@out);
 #::logDebug("did next_search: " . ::uneval(\@out));
 	}
+
+	$s->{matches} = scalar(@out);
 
 	if($delayed_return and $s->{matches} > 0) {
 		$s->hash_fields($s->{mv_field_names}, qw/mv_sort_field/);