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

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index 671e340..ad43390 100644
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -100,13 +100,14 @@ sub read_entry {
     read_entry_all( $hash, $key, $results, \@non_results, $opts );
 }
 
-#FIXME: make configurable
-my %fallback_suites = (
-		       'oldstable-backports' => 'oldstable',
-		       'oldstable-volatile' => 'oldstable',
-		       'stable-backports' => 'stable',
-		       'stable-volatile' => 'stable',
-		       experimental => 'unstable' );
+sub fallback_suite {
+    my $suite = shift;
+    if ($suite =~ /^(\S+)-(?:updates|backports)/) {
+	return $1;
+    } else {
+	return undef;
+    }
+}
 
 sub read_entry_simple {
     my ($hash, $key, $archives, $suite) = @_;
@@ -126,7 +127,7 @@ sub read_entry_simple {
 	debug( "use entry: @data", 2 ) if DEBUG && $data[1] eq $suite;
 	return [ $virt{$suite}, @data ] if $data[1] eq $suite;
     }
-    if (my $fb_suite = $fallback_suites{$suite}) {
+    if (my $fb_suite = fallback_suite($suite)) {
 	my $fb_result = read_entry_simple( $hash, $key, $archives, $fb_suite );
 	my $fb_virt = shift(@$fb_result);
 	$virt{$suite} .= $virt{$suite} ? " $fb_virt" : $fb_virt if $fb_virt;
@@ -204,41 +205,38 @@ sub do_xapian_search {
 # NOTE: this needs to correspond with parse-packages!
     my @tmp;
     foreach my $keyword (@$keywords) {
-	$keyword =~ tr [A-Z] [a-z];
-	if ($opts->{exact}) {
-	    $keyword = " $keyword ";
-	}
-	$keyword =~ s/[(),.-]+//og;
-	$keyword =~ s;[^a-z0-9_/+]+; ;og;
+	$keyword =~ s;[^\w/+]+; ;og;
 	push @tmp, $keyword;
     }
     my $stemmer = Lingua::Stem->new();
-    $keywords = $stemmer->stem( @tmp );
+    my $stemmed_keywords = $stemmer->stem( @tmp );
 
     my $db = Search::Xapian::Database->new( $db );
-    my $enq = $db->enquire( OP_AND, @$keywords );
+    my $enq = $db->enquire( OP_OR, @$keywords, @$stemmed_keywords );
     debug( "Xapian Query was: ".$enq->get_query()->get_description(), 1) if DEBUG;
-    my @matches = $enq->matches(0, 100);
+    my @matches = $enq->matches(0, 999);
 
-    my $numres = 0;
-    my %tmp_results;
+    my (@order, %tmp_results);
     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;
+	    debug ("Considering $data[0], arch = $data[2], relevance=".$match->get_percent(), 3) if DEBUG;
 #	    next unless $data[2] eq 'all' || $opts->{h_archs}{$data[2]};
 #	    debug ("Ok", 3) if DEBUG;
-	    $numres++ unless $tmp_results{$data[0]}++;
+	    unless ($tmp_results{$data[0]}++) {
+		push @order, $data[0];
+	    }
 	}
-	last if $numres > 100;
+	last if @order > 100;
     }
     undef $db;
-    $too_many_hits++ if $numres > 100;
+    $too_many_hits++ if @order > 100;
 
-    foreach my $pkg (keys %tmp_results) {
+    debug ("ORDER: @order", 2) if DEBUG;
+    foreach my $pkg (@order) {
 	&$read_entry( $packages, $pkg, $results, $non_results, $opts );
     }
 }