$index_line
"; - } -} - -#sub multipageheader { -# my ( $input, $no_results, $opts ) = @_; -# -# my ($start, $end); -# if ($opts->{number} =~ /^all$/i) { -# $start = 1; -# $end = $no_results; -# $opts->{number} = $no_results; -# $opts->{number_all}++; -# } else { -# $start = Packages::Search::start( $opts ); -# $end = Packages::Search::end( $opts ); -# if ($end > $no_results) { $end = $no_results; } -# } -# -# print "Found $no_results matching packages,"; -# if ($end == $start) { -# print " displaying package $end.
"; -# } else { -# print " displaying packages $start to $end."; -# } -# -# printindexline( $input, $no_results, $opts ); -# -# if ($no_results > 100) { -# print "Results per page: "; -# my @resperpagelinks; -# for (50, 100, 200) { -# if ($opts->{number} == $_) { -# push @resperpagelinks, $_; -# } else { -# push @resperpagelinks, resperpagelink($input,$opts,$_); -# } -# } -# if ($opts->{number_all}) { -# push @resperpagelinks, "all"; -# } else { -# push @resperpagelinks, resperpagelink($input, $opts, "all"); -# } -# print join( " | ", @resperpagelinks )."
"; -# } -# return ( $start, $end ); -#} - -sub read_entry_all { - my ($hash, $key, $results, $non_results, $opts) = @_; - my $result = $hash->{$key} || ''; foreach (split /\000/o, $result) { my @data = split ( /\s/o, $_, 8 ); - debug( "Considering entry ".join( ':', @data), 2); - if ($opts->{h_archives}{$data[0]} && $opts->{h_suites}{$data[1]} - && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all' - || $data[2] eq 'virtual') - && ($opts->{h_sections}{$data[3]} || $data[3] eq 'v')) { - debug( "Using entry ".join( ':', @data), 2); + debug( "Considering entry ".join( ':', @data), 2) if DEBUG; + if ($opts->{h_suites}{$data[1]} + && ($opts->{h_archs}{$data[2]} || $data[2] eq 'all') + && $opts->{h_sections}{$data[3]}) { + debug( "Using entry ".join( ':', @data), 2) if DEBUG; push @$results, [ $key, @data ]; } else { push @$non_results, [ $key, @data ]; @@ -360,48 +97,51 @@ sub read_entry { my @non_results; read_entry_all( $hash, $key, $results, \@non_results, $opts ); } + +#FIXME: make configurable +my %fallback_suites = ( + 'stable-backports' => 'stable', + 'stable-volatile' => 'stable', + experimental => 'unstable' ); + sub read_entry_simple { my ($hash, $key, $archives, $suite) = @_; - my $result = $hash->{$key} || ''; + # FIXME: drop $archives + + my ($virt, $result) = split /\000/o, $hash->{$key} || "-\01-\0", 2; + my %virt = split /\01/o, $virt; debug( "read_entry_simple: key=$key, archives=". - join(" ",(keys %$archives)).", suite=$suite", 1); - my (@data_fuzzy, @data_virtual, @data_fuzzy_virtual); + join(" ",(keys %$archives)).", suite=$suite", 1) if DEBUG; + debug( "read_entry_simple: virt=".join(" ",(%virt)), 2) if DEBUG; + # FIXME: not all of the 2^4=16 combinations of empty(results), + # empty(virt{suite}), empty(fb_result), empty(virt{fb_suite}) are dealt + # 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 ); - debug( "Considering entry ".join( ':', @data), 2); - if ($data[1] eq $suite) { - if ($archives->{$data[0]} - && ($data[2] ne 'virtual')) { - debug( "Using entry ".join( ':', @data), 2); - 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( "Virtual fuzzy entry ".join( ':', @data), 2); - @data_fuzzy_virtual = @data; - } - } + debug( "use entry: @data", 2 ) if DEBUG && $data[1] eq $suite; + return [ $virt{$suite}, @data ] if $data[1] eq $suite; } - return \@data_virtual if @data_virtual; - return \@data_fuzzy if @data_fuzzy; - return \@data_fuzzy_virtual; + if (my $fb_suite = $fallback_suites{$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; + return [ $virt{$suite}, @$fb_result ] if @$fb_result; + } + return [ $virt{$suite} ]; } + sub read_src_entry_all { my ($hash, $key, $results, $non_results, $opts) = @_; my $result = $hash->{$key} || ''; - debug( "read_src_entry_all: key=$key", 1); + debug( "read_src_entry_all: key=$key", 1) if DEBUG; foreach (split /\000/o, $result) { my @data = split ( /\s/o, $_, 6 ); - debug( "Considering entry ".join( ':', @data), 2); + debug( "Considering entry ".join( ':', @data), 2) if DEBUG; if ($opts->{h_archives}{$data[0]} && $opts->{h_suites}{$data[1]} && $opts->{h_sections}{$data[2]}) { - debug( "Using entry ".join( ':', @data), 2); + debug( "Using entry ".join( ':', @data), 2) if DEBUG; push @$results, [ $key, @data ]; } else { push @$non_results, [ $key, @data ]; @@ -414,23 +154,29 @@ sub read_src_entry { read_src_entry_all( $hash, $key, $results, \@non_results, $opts ); } sub do_names_search { - my ($keyword, $packages, $postfixes, $read_entry, $opts, + my ($keywords, $packages, $postfixes, $read_entry, $opts, $results, $non_results) = @_; - $keyword = lc $keyword; + my $first_keyword = lc shift @$keywords; + @$keywords = map { lc $_ } @$keywords; - my ($key, $prefixes) = ($keyword, ''); + my ($key, $prefixes) = ($first_keyword, ''); my %pkgs; $postfixes->seq( $key, $prefixes, R_CURSOR ); - while (index($key, $keyword) >= 0) { + while (index($key, $first_keyword) >= 0) { if ($prefixes =~ /^\001(\d+)/o) { - debug( "$key has too many hits", 2 ); + debug( "$key has too many hits", 2 ) if DEBUG; $too_many_hits += $1; } else { + PREFIX: foreach (split /\000/o, $prefixes) { $_ = '' if $_ eq '^'; - debug( "add word $_$key", 2); - $pkgs{$_.$key}++; + my $word = "$_$key"; + foreach my $k (@$keywords) { + next PREFIX unless $word =~ /\Q$k\E/; + } + debug( "add word $word", 2) if DEBUG; + $pkgs{$word}++; } } last if $postfixes->seq( $key, $prefixes, R_NEXT ) != 0; @@ -440,39 +186,49 @@ sub do_names_search { my $no_results = keys %pkgs; if ($too_many_hits || ($no_results >= 100)) { $too_many_hits += $no_results; - %pkgs = ( $keyword => 1 ); + %pkgs = ( $first_keyword => 1 ) unless @$keywords; } foreach my $pkg (sort keys %pkgs) { &$read_entry( $packages, $pkg, $results, $non_results, $opts ); } } sub do_fulltext_search { - my ($keyword, $file, $did2pkg, $packages, $read_entry, $opts, + my ($keywords, $file, $did2pkg, $packages, $read_entry, $opts, $results, $non_results) = @_; # NOTE: this needs to correspond with parse-packages! - $keyword =~ tr [A-Z] [a-z]; - if ($opts->{exact}) { - $keyword = " $keyword "; + 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; + push @tmp, $keyword; } - $keyword =~ s/[(),.-]+//og; - $keyword =~ s#[^a-z0-9_/+]+# #og; + my $first_keyword = shift @tmp; + @$keywords = @tmp; my $numres = 0; my %tmp_results; # fgrep is seriously faster than using perl - open DESC, '-|', 'fgrep', '-n', '--', $keyword, $file + open DESC, '-|', 'fgrep', '-n', '--', $first_keyword, $file or die "couldn't open $file: $!"; + LINE: while (