X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoSearchContents.pm;h=e86fc789783ef06dcecd7e9442535db7530f4c78;hb=f27f1fcc5bffc0696f694e962eb40dbb0c554855;hp=f66ba875a98c7fa54f2ddbb6930c87c6766b4c5a;hpb=dd9f98daf94d68c800bb08d831627a4641c8de4c;p=deb%2Fpackages.git diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm index f66ba87..e86fc78 100644 --- a/lib/Packages/DoSearchContents.pm +++ b/lib/Packages/DoSearchContents.pm @@ -3,7 +3,7 @@ package Packages::DoSearchContents; use strict; use warnings; -use Benchmark; +use Benchmark ':hireswallclock'; use DB_File; use URI::Escape; use HTML::Entities; @@ -12,19 +12,26 @@ our @ISA = qw( Exporter ); our @EXPORT = qw( do_search_contents ); use Deb::Versions; +use Packages::I18N::Locale; use Packages::Search qw( :all ); use Packages::CGI; use Packages::DB; -use Packages::Config qw( $DBDIR $SEARCH_URL $SEARCH_CGI $SEARCH_PAGE +use Packages::Config qw( $DBDIR $SEARCH_URL $SEARCH_PAGE @SUITES @ARCHIVES $ROOT ); sub do_search_contents { my ($params, $opts, $html_header, $menu, $page_content) = @_; if ($params->{errors}{keywords}) { - fatal_error( "keyword not valid or missing" ); + fatal_error( _g( "keyword not valid or missing" ) ); } elsif (length($opts->{keywords}) < 2) { - fatal_error( "keyword too short (keywords need to have at least two characters)" ); + fatal_error( _g( "keyword too short (keywords need to have at least two characters)" ) ); + } + if ($params->{errors}{suite}) { + fatal_error( _g( "suite not valid or not specified" ) ); + } + if (@{$opts->{suite}} > 1) { + fatal_error( sprintf( _g( "more than one suite specified for contents search (%s)" ), "@{$opts->{suite}}" ) ); } $$menu = ""; @@ -32,6 +39,9 @@ sub do_search_contents { my $keyword = $opts->{keywords}; my $searchon = $opts->{searchon}; my $exact = $opts->{exact}; + my $suite = $opts->{suite}[0]; + my $archive = $opts->{archive}[0] ||''; + $Packages::Search::too_many_hits = 0; # for URL construction my $keyword_esc = uri_escape( $keyword ); @@ -47,7 +57,7 @@ sub do_search_contents { my $archs_enc = encode_entities( join( ', ', @{$params->{values}{arch}{no_replace}} ) ); my $st0 = new Benchmark; - my (@results, @non_results); + my (@results); unless (@Packages::CGI::fatal_errors) { @@ -57,20 +67,23 @@ sub do_search_contents { # full filename search is tricky my $ffn = $searchon eq 'filenames'; - my $suite = 'stable'; #fixme - my $reverses = tie my %reverses, 'DB_File', "$DBDIR/contents/reverse_$suite.db", O_RDONLY, 0666, $DB_BTREE or die "Failed opening reverse DB: $!"; if ($ffn) { - open FILENAMES, '-|', 'fgrep', '--', "$kw", "$DBDIR/contents/filenames_$suite.txt" + open FILENAMES, '-|', 'fgrep', '--', $kw, "$DBDIR/contents/filenames_$suite.txt" or die "Failed opening filename table: $!"; + + error( _g( "Exact and fullfilenamesearch don't go along" ) ) + if $ffn and $exact; + while () { chomp; - last unless &searchfile(\@results, reverse($_)."/", \$nres, $reverses); + &searchfile(\@results, reverse($_)."/", \$nres, $reverses); + last if $Packages::Search::too_many_hits; } - close FILENAMES; + close FILENAMES or warn "fgrep error: $!\n"; } else { $kw = reverse $kw; @@ -78,8 +91,6 @@ sub do_search_contents { # exact filename searching follows trivially: $kw = "$kw/" if $exact; - print "ERROR: Exact and fullfilenamesearch don't go along" if $ffn and $exact; - &searchfile(\@results, $kw, \$nres, $reverses); } $reverses = undef; @@ -88,7 +99,7 @@ sub do_search_contents { my $st1 = new Benchmark; my $std = timediff($st1, $st0); - debug( "Search took ".timestr($std) ); + debug( "Search took ".timestr($std) ) if DEBUG; } my $suite_wording = $suites_enc eq "all" ? "all suites" @@ -102,17 +113,16 @@ sub do_search_contents { msg( "You have searched for ${wording} $keyword_enc in $suite_wording, $section_wording, and $arch_wording." ); if ($Packages::Search::too_many_hits) { - error( "Your search was too wide so we will only display exact matches. At least $Packages::Search::too_many_hits results have been omitted and will not be displayed. Please consider using a longer keyword or more keywords." ); + error( _g( "Your search was too wide so we will only display only the first about 100 matches. Please consider using a longer keyword or more keywords." ) ); } - $$page_content = ''; if (!@Packages::CGI::fatal_errors && !@results) { - $$page_content .= "No results"; + error( _g( "Nothing found" ) ); } - %$html_header = ( title => 'Package Contents Search Results' , - lang => 'en', - title_tag => 'Debian Package Contents Search Results', + %$html_header = ( title => _g( 'Package Contents Search Results' ), + lang => $opts->{lang}, + title_tag => _g( 'Debian Package Contents Search Results' ), print_title => 1, print_search_field => 'packages', search_field_values => { @@ -126,11 +136,26 @@ sub do_search_contents { }, ); + $$page_content = ''; if (@results) { - $$page_content .= scalar @results . " results displayed:
"; - foreach (@results) { - $$page_content .= "$_
\n"; + $$page_content .= "

".sprintf( _g( 'Found %s results' ), + scalar @results )."

"; + $$page_content .= '
'; + foreach my $result (sort { $a->[0] cmp $b->[0] } @results) { + my $file = shift @$result; + $$page_content .= "'; } + $$page_content .= '' if @results > 20; + $$page_content .= '
'._g('File').''._g('Packages') + .'
/$file"; + my %pkgs; + foreach (@$result) { + my ($pkg, $arch) = split /:/, $_; + $pkgs{$pkg}{$arch}++; + } + $$page_content .= join( ", ", map { "$_" } sort keys %pkgs); + $$page_content .= '
'._g('File').''._g('Packages').'
'; } } # sub do_search_contents @@ -139,6 +164,7 @@ sub searchfile my ($results, $kw, $nres, $reverses) = @_; my ($key, $value) = ($kw, ""); + debug( "searchfile: kw=$kw", 1 ) if DEBUG; for (my $status = $reverses->seq($key, $value, R_CURSOR); $status == 0; $status = $reverses->seq( $key, $value, R_NEXT)) { @@ -146,14 +172,14 @@ sub searchfile # FIXME: what's the most efficient "is prefix of" thingy? We only want to know # whether $kw is or is not a prefix of $key last unless index($key, $kw) == 0; + debug( "found $key", 2 ) if DEBUG; my @hits = split /\0/o, $value; - push @$results, reverse($key)." is found in @hits"; + push @$results, [ scalar reverse($key), @hits ]; last if ($$nres)++ > 100; } -# FIXME: use too_many_hits - return $$nres<100; + $Packages::Search::too_many_hits += $$nres - 100 if $$nres > 100; }