[interchange-cvs] interchange - jon modified lib/Vend/TextSearch.pm

[interchange-core@interchange.redhat.com]

User:      jon
Date:      2001-12-07 04:16:06 GMT
Modified:  lib/Vend TextSearch.pm
Log:
I finally found it! The bug was only for text searches, so it went away
when I changed icmenu's search type to db.

The array of search lines was getting crammed into a single array element
on the second pass for sorting.

Revision  Changes    Path
2.2       +4 -4      interchange/lib/Vend/TextSearch.pm


rev 2.2, prev_rev 2.1
Index: TextSearch.pm
===================================================================
RCS file: /var/cvs/interchange/lib/Vend/TextSearch.pm,v
retrieving revision 2.1
retrieving revision 2.2
diff -u -u -r2.1 -r2.2
--- TextSearch.pm	2001/11/26 18:34:02	2.1
+++ TextSearch.pm	2001/12/07 04:16:06	2.2
@@ -1,6 +1,6 @@
 # Vend::TextSearch - Search indexes with Perl
 #
-# $Id: TextSearch.pm,v 2.1 2001/11/26 18:34:02 mheins Exp $
+# $Id: TextSearch.pm,v 2.2 2001/12/07 04:16:06 jon 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.1 $, 10);
+$VERSION = substr(q$Revision: 2.2 $, 10);
 
 use Search::Dict;
 use strict;
@@ -269,7 +269,7 @@
 		if($s->{mv_dict_end} && defined $limit_sub) {
 			while(<SEARCH>) {
 #::logDebug("$_");
-				last if &$dict_limit($_);
+				last if $dict_limit->($_);
 				next unless &$f();
 				next unless $limit_sub->($_);
 				(push @out, $searchfile and last)
@@ -325,7 +325,7 @@
 		$s->hash_fields($s->{mv_field_names}, qw/mv_sort_field/);
 #::logDebug("after hash fields: self=" . ::Vend::Util::uneval_it({%$s}));
 		$s->sort_search_return(\@out);
-		$delayed_return = $s->get_return(1,1);
+		$delayed_return = $s->get_return(1);
 		@out = map { $delayed_return->($_) } @out;
 	}
 #::logDebug("after delayed return: self=" . ::Vend::Util::uneval_it({%$s}));