fix off-by-one after switching on the brain again

[deb/packages.git] / lib / Packages / Search.pm

diff --git a/lib/Packages/Search.pm b/lib/Packages/Search.pm
index be7bebd05f1aee4e9f635fd38be82cf7a47dd677..3a47e3d55ae6f2e39881cfec4e4e762068204080 100644 (file)
--- a/lib/Packages/Search.pm
+++ b/lib/Packages/Search.pm
@@ -74,16 +74,16 @@ sub read_entry_all {
     while (my ($suite, $provides) = each %virt) {
        next if $suite eq '-';
        if ($opts->{h_suites}{$suite}) {
-           push @$results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
+           push @$results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v', 'v',
                              $provides];
        } else {
-           push @$non_results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v',
+           push @$non_results, [ $key, "-", $suite, 'virtual', 'v', 'v', 'v', 'v', 'v',
                                  $provides];
        }
     }
 
     foreach (split(/\000/o, $result||'')) {
-       my @data = split ( /\s/o, $_, 8 );
+       my @data = split ( /\s/o, $_, 9 );
        debug( "Considering entry ".join( ':', @data), 2) if DEBUG;
        if ($opts->{h_suites}{$data[1]}
            && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all')
@@ -101,13 +101,16 @@ sub read_entry {
     read_entry_all( $hash, $key, $results, \@non_results, $opts );
 }
 
-#FIXME: make configurable
-my %fallback_suites = (
-                      'sarge-backports' => 'sarge',
-                      'sarge-volatile' => 'sarge',
-                      'etch-backports' => 'etch',
-                      'etch-volatile' => 'etch',
-                      experimental => 'sid' );
+sub fallback_suite {
+    my $suite = shift;
+    if ($suite =~ /^(\S+)-(?:updates|backports|volatile)/) {
+       return $1;
+    } elsif ($suite eq 'experimental') {
+       return 'sid';
+    } else {
+       return undef;
+    }
+}
 
 sub read_entry_simple {
     my ($hash, $key, $archives, $suite) = @_;
@@ -123,11 +126,11 @@ sub read_entry_simple {
     # with correctly, but it's adequate enough for now
     return [ $virt{$suite} ] unless defined $result;
     foreach (split /\000/o, $result) {
-       my @data = split ( /\s/o, $_, 8 );
+       my @data = split ( /\s/o, $_, 9 );
        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;
@@ -164,14 +167,22 @@ sub do_names_search {
 
     my $first_keyword = lc shift @$keywords;
     @$keywords = map { lc $_ } @$keywords;
-        
+
     my ($key, $prefixes) = ($first_keyword, '');
-    my %pkgs;
+    my (%pkgs, %pkgs_min);
     $postfixes->seq( $key, $prefixes, R_CURSOR );
     while (index($key, $first_keyword) >= 0) {
-       if ($prefixes =~ /^\001(\d+)/o) {
-           debug( "$key has too many hits", 2 ) if DEBUG;
-           $too_many_hits += $1;
+       if ($prefixes =~ /^(\^)?\001(\d+)/o) {
+           debug("$key has too many hits", 2 ) if DEBUG;
+           $too_many_hits += $2;
+           if ($1) { # use the empty prefix
+               foreach my $k (@$keywords) {
+                   next unless $key =~ /\Q$k\E/;
+               }
+               debug("add key $key", 2) if DEBUG;
+               $pkgs{$key}++;
+               $pkgs_min{$key}++;
+           }
        } else {
          PREFIX:
            foreach (split /\000/o, $prefixes) {
@@ -180,18 +191,21 @@ sub do_names_search {
                foreach my $k (@$keywords) {
                    next PREFIX unless $word =~ /\Q$k\E/;
                }
-               debug( "add word $word", 2) if DEBUG;
+               debug("add word $word", 2) if DEBUG;
                $pkgs{$word}++;
+               $pkgs_min{$word}++ if $_ eq '';
            }
        }
        last if $postfixes->seq( $key, $prefixes, R_NEXT ) != 0;
-       last if $too_many_hits or keys %pkgs >= 100;
+       last if keys %pkgs_min >= 100;
     }
-    
-    my $no_results = keys %pkgs;
-    if ($too_many_hits || ($no_results >= 100)) {
-       $too_many_hits += $no_results;
-       %pkgs = ( $first_keyword => 1 ) unless @$keywords;
+
+    my $nr = keys %pkgs;
+    my $min_nr = keys %pkgs_min;
+    debug("nr=$nr min_nr=$min_nr too_many_hits=$too_many_hits", 1) if DEBUG;
+    if ($nr >= 100) {
+       $too_many_hits += $nr - $min_nr + 1;
+       %pkgs = %pkgs_min;
     }
     foreach my $pkg (sort keys %pkgs) {
        &$read_entry( $packages, $pkg, $results, $non_results, $opts );
@@ -282,7 +296,9 @@ sub find_similar {
     undef $db;
 
     debug ("ORDER: @order", 2) if DEBUG;
-    return @order[0..10];
+    my $last = 10;
+    $last = $#order if $#order < $last;
+    return @order[0..$last];
 }
 
 sub find_binaries {