X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FSearch.pm;h=931747c618ed84b4863f9d3a183fbff349983835;hb=56d4b3ed57e20359e5ea46feabb850cf4a94caf2;hp=ba3b68c94ea11e6f58b0a85cdbe7d056d63f4c64;hpb=ae7fe4440b28ab29c329da886a063c3e74f034cf;p=deb%2Fpackages.git

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index ba3b68c..931747c 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -43,7 +43,7 @@ package Packages::Search;
 use strict;
 use warnings;
 
-use CGI qw( -oldstyle_urls );
+#use CGI ();
 use POSIX;
 use HTML::Entities;
 use DB_File;
@@ -365,7 +365,7 @@ sub read_entry_simple {
     my $result = $hash->{$key} || '';
     debug( "read_entry_simple: key=$key, archives=".
 	   join(" ",(keys %$archives)).", suite=$suite", 1);
-    my @data_fuzzy;
+    my (@data_fuzzy, @data_virtual, @data_fuzzy_virtual);
     foreach (split /\000/o, $result) {
 	my @data = split ( /\s/o, $_, 8 );
 	debug( "Considering entry ".join( ':', @data), 2);
@@ -376,14 +376,20 @@ sub read_entry_simple {
 		return \@data;
 	    } elsif ($archives->{$data[0]}) {
 		debug( "Virtual entry ".join( ':', @data), 2);
+		@data_virtual = @data;
+	    } elsif (($data[0] eq 'us')
+		     && ($data[2] ne 'virtual')) {
+		debug( "Fuzzy entry ".join( ':', @data), 2);
 		@data_fuzzy = @data;
 	    } elsif ($data[0] eq 'us') {
-		debug( "Fuzzy entry ".join( ':', @data), 2);
-		@data_fuzzy = @data unless @data_fuzzy;
+		debug( "Virtual fuzzy entry ".join( ':', @data), 2);
+		@data_fuzzy_virtual = @data;
 	    }
 	} 
     }
-    return \@data_fuzzy;
+    return \@data_virtual if @data_virtual;
+    return \@data_fuzzy if @data_fuzzy;
+    return \@data_fuzzy_virtual;
 }
 sub read_src_entry_all {
     my ($hash, $key, $results, $non_results, $opts) = @_;
@@ -454,12 +460,14 @@ sub do_fulltext_search {
 
     my $numres = 0;
     my %tmp_results;
-    open DESC, '<', "$file"
+    # fgrep is seriously faster than using perl
+    open DESC, '-|', 'fgrep', '-n', '--', $keyword, $file
 	or die "couldn't open $file: $!";
     while (<DESC>) {
-	next if (index $_, $keyword) < 0;
-	debug( "Matched line $.: $_", 2);
-	my $result = $did2pkg->{$.};
+	/^(\d+)/;
+	my $nr = $1;
+	debug( "Matched line $_", 2);
+	my $result = $did2pkg->{$nr};
 	foreach (split /\000/o, $result) {
 	    my @data = split /\s/, $_, 3;
 #	    debug ("Considering $data[0], arch = $data[2]", 3);