X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FSearch.pm;h=671e3401c1f75fe7eadef8f82182e7a1cb2660ae;hb=cdae3720732a12007e363f01c24de74c2620d969;hp=c6a521ad65385d2cf11daa6f9ca95e8f00f3eb40;hpb=a38d98d27880c8fc0f4d98646e318ecc1d39884f;p=deb%2Fpackages.git

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index c6a521a..671e340 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -46,6 +46,8 @@ use warnings;
 use POSIX;
 use HTML::Entities;
 use DB_File;
+use Lingua::Stem v0.82;
+use Search::Xapian qw(:ops);
 
 use Deb::Versions;
 use Packages::CGI;
@@ -55,7 +57,7 @@ our @ISA = qw( Exporter );
 
 our @EXPORT_OK = qw( read_entry read_entry_all read_entry_simple
 		     read_src_entry read_src_entry_all find_binaries
-		     do_names_search do_fulltext_search
+		     do_names_search do_fulltext_search do_xapian_search
 		     );
 our %EXPORT_TAGS = ( all => [ @EXPORT_OK ] );
 
@@ -100,6 +102,8 @@ sub read_entry {
 
 #FIXME: make configurable
 my %fallback_suites = (
+		       'oldstable-backports' => 'oldstable',
+		       'oldstable-volatile' => 'oldstable',
 		       'stable-backports' => 'stable',
 		       'stable-volatile' => 'stable',
 		       experimental => 'unstable' );
@@ -192,8 +196,9 @@ sub do_names_search {
 	&$read_entry( $packages, $pkg, $results, $non_results, $opts );
     }
 }
-sub do_fulltext_search {
-    my ($keywords, $file, $did2pkg, $packages, $read_entry, $opts,
+
+sub do_xapian_search {
+    my ($keywords, $db, $did2pkg, $packages, $read_entry, $opts,
 	$results, $non_results) = @_;
 
 # NOTE: this needs to correspond with parse-packages!
@@ -207,23 +212,20 @@ sub do_fulltext_search {
 	$keyword =~ s;[^a-z0-9_/+]+; ;og;
 	push @tmp, $keyword;
     }
-    my $first_keyword = shift @tmp;
-    @$keywords = @tmp;
+    my $stemmer = Lingua::Stem->new();
+    $keywords = $stemmer->stem( @tmp );
+
+    my $db = Search::Xapian::Database->new( $db );
+    my $enq = $db->enquire( OP_AND, @$keywords );
+    debug( "Xapian Query was: ".$enq->get_query()->get_description(), 1) if DEBUG;
+    my @matches = $enq->matches(0, 100);
 
     my $numres = 0;
     my %tmp_results;
-    # fgrep is seriously faster than using perl
-    open DESC, '-|', 'fgrep', '-n', '--', $first_keyword, $file
-	or die "couldn't open $file: $!";
-  LINE:
-    while (<DESC>) {
-	foreach my $k (@$keywords) {
-	    next LINE unless /\Q$k\E/;
-	}
-	/^(\d+)/;
-	my $nr = $1;
-	debug( "Matched line $_", 2) if DEBUG;
-	my $result = $did2pkg->{$nr};
+    foreach my $match ( @matches ) {
+	my $id = $match->get_docid();
+	my $result = $did2pkg->{$id};
+
 	foreach (split /\000/o, $result) {
 	    my @data = split /\s/, $_, 3;
 #	    debug ("Considering $data[0], arch = $data[2]", 3) if DEBUG;
@@ -233,14 +235,13 @@ sub do_fulltext_search {
 	}
 	last if $numres > 100;
     }
-    close DESC;
+    undef $db;
     $too_many_hits++ if $numres > 100;
 
-    my @results;
     foreach my $pkg (keys %tmp_results) {
 	&$read_entry( $packages, $pkg, $results, $non_results, $opts );
     }
- }
+}
 
 sub find_binaries {
     my ($pkg, $archive, $suite, $src2bin) = @_;