X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=lib%2FPackages%2FDoSearchContents.pm;h=7ae679826ca29ef004bdc6925f0291981ea26ac9;hb=8d29452530e823cbcd07a30898e98abe565a046c;hp=4588235a559987131147642d3da946e6eed0d3dc;hpb=56d4b3ed57e20359e5ea46feabb850cf4a94caf2;p=deb%2Fpackages.git diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm index 4588235..7ae6798 100644 --- a/lib/Packages/DoSearchContents.pm +++ b/lib/Packages/DoSearchContents.pm @@ -23,15 +23,15 @@ sub do_search_contents { my ($params, $opts, $html_header, $menu, $page_content) = @_; if ($params->{errors}{keywords}) { - fatal_error( gettext( "keyword not valid or missing" ) ); + fatal_error( _g( "keyword not valid or missing" ) ); } elsif (length($opts->{keywords}) < 2) { - fatal_error( gettext( "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( gettext( "suite not valid or not specified" ) ); + fatal_error( _g( "suite not valid or not specified" ) ); } if (@{$opts->{suite}} > 1) { - fatal_error( sprintf( gettext( "more than one suite specified for contents search (%s)" ), "@{$opts->{suite}}" ) ); + fatal_error( sprintf( _g( "more than one suite specified for contents search (%s)" ), "@{$opts->{suite}}" ) ); } $$menu = ""; @@ -75,7 +75,7 @@ sub do_search_contents { open FILENAMES, '-|', 'fgrep', '--', $kw, "$DBDIR/contents/filenames_$suite.txt" or die "Failed opening filename table: $!"; - error( gettext( "Exact and fullfilenamesearch don't go along" ) ) + error( _g( "Exact and fullfilenamesearch don't go along" ) ) if $ffn and $exact; while () { @@ -99,30 +99,32 @@ 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" - : "suite(s) $suites_enc"; - my $section_wording = $sections_enc eq 'all' ? "all sections" - : "section(s) $sections_enc"; - my $arch_wording = $archs_enc eq 'any' ? "all architectures" - : "architecture(s) $archs_enc"; - my $wording = $opts->{exact} ? "exact filenames" : "filenames that contain"; - $wording = "paths that end with" if $searchon eq "contents"; - msg( "You have searched for ${wording} $keyword_enc in $suite_wording, $section_wording, and $arch_wording." ); + my $suite_wording = $suites_enc eq "all" ? _g("all suites") + : sprintf(_g("suite(s) %s", $suites_enc) ); + my $section_wording = $sections_enc eq 'all' ? _g("all sections") + : sprintf(_g("section(s) %s", $sections_enc) ); + my $arch_wording = $archs_enc eq 'any' ? _g("all architectures") + : sprintf(_g("architecture(s) %s", $archs_enc) ); + my $wording = $opts->{exact} ? _g("exact filenames") : _g("filenames that contain"); + $wording = _g("paths that end with") if $searchon eq "contents"; + msg( sprintf( _g("You have searched for %s %s in %s, %s, and %s." ), + $wording, $keyword_enc, + $suite_wording, $section_wording, $arch_wording ) ); if ($Packages::Search::too_many_hits) { - error( gettext( "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." ) ); + 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." ) ); } if (!@Packages::CGI::fatal_errors && !@results) { - error( gettext( "Nothing found" ) ); + error( _g( "Nothing found" ) ); } - %$html_header = ( title => gettext( 'Package Contents Search Results' ), + %$html_header = ( title => _g( 'Package Contents Search Results' ), lang => $opts->{lang}, - title_tag => gettext( 'Debian Package Contents Search Results' ), + title_tag => _g( 'Debian Package Contents Search Results' ), print_title => 1, print_search_field => 'packages', search_field_values => { @@ -138,13 +140,14 @@ sub do_search_contents { $$page_content = ''; if (@results) { - $$page_content .= "

".sprintf( gettext( 'Found %s results' ), + $$page_content .= "

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

"; - $$page_content .= '
'.gettext('File').''.gettext('Packages') + $$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 .= '' if @results > 20; $$page_content .= '
'._g('File').''._g('Packages') .'
$file"; + $$page_content .= "
/$file"; my %pkgs; foreach (@$result) { my ($pkg, $arch) = split /:/, $_; @@ -153,7 +156,7 @@ sub do_search_contents { $$page_content .= join( ", ", map { "$_" } sort keys %pkgs); $$page_content .= '
'.gettext('File').''.gettext('Packages').'
'._g('File').''._g('Packages').'
'; } } # sub do_search_contents @@ -163,7 +166,7 @@ sub searchfile my ($results, $kw, $nres, $reverses) = @_; my ($key, $value) = ($kw, ""); - debug( "searchfile: kw=$kw", 1 ); + 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)) { @@ -171,7 +174,7 @@ 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 ); + debug( "found $key", 2 ) if DEBUG; my @hits = split /\0/o, $value; push @$results, [ scalar reverse($key), @hits ];