X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDoSearch.pm;h=f8782b1e5bd96fe65deccfba0dd2866cd493eec1;hp=d8aa6d8194dbe97ffccffefaf83395052058db12;hb=06c6f30bfc4f55cecc7485fef0f0a227e32b44f0;hpb=47c93cb066364b11f0b216589ddc68671435b060 diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm index d8aa6d8..f8782b1 100644 --- a/lib/Packages/DoSearch.pm +++ b/lib/Packages/DoSearch.pm @@ -12,11 +12,14 @@ our @ISA = qw( Exporter ); our @EXPORT = qw( do_search ); use Deb::Versions; +use Packages::I18N::Locale; use Packages::Search qw( :all ); use Packages::CGI; use Packages::DB; +use Packages::HTML qw(marker); use Packages::Config qw( $DBDIR $SEARCH_URL $SEARCH_PAGE @SUITES @ARCHIVES $ROOT ); +use Packages::HTML; sub do_search { my ($params, $opts, $html_header, $menu, $page_content) = @_; @@ -24,25 +27,23 @@ sub do_search { $Params::Search::too_many_hits = 0; if ($params->{errors}{keywords}) { - fatal_error( "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 not valid or missing" ) ); + $opts->{keywords} = []; + } elsif (grep { length($_) < 2 } @{$opts->{keywords}}) { + fatal_error( _g( "keyword too short (keywords need to have at least two characters)" ) ); } $$menu = ""; - my $keyword = $opts->{keywords}; + my @keywords = @{$opts->{keywords}}; my $searchon = $opts->{searchon}; # for URL construction - my $keyword_esc = uri_escape( $keyword ); - my $suites_param = join ',', @{$params->{values}{suite}{no_replace}}; - my $sections_param = join ',', @{$params->{values}{section}{no_replace}}; - my $archs_param = join ',', @{$params->{values}{arch}{no_replace}}; - $opts->{common_params} = "suite=$suites_param;section=$sections_param;keywords=$keyword_esc;searchon=$searchon;arch=$archs_param"; + my $keyword_esc = uri_escape( "@keywords" ); + $opts->{keywords_esc} = $keyword_esc; # for output - my $keyword_enc = encode_entities $keyword || ''; + my $keyword_enc = encode_entities "@keywords" || ''; my $searchon_enc = encode_entities $searchon; my $suites_enc = encode_entities( join( ', ', @{$params->{values}{suite}{no_replace}} ) ); my $sections_enc = encode_entities( join( ', ', @{$params->{values}{section}{no_replace}} ) ); @@ -55,22 +56,19 @@ sub do_search { if ($searchon eq 'names') { if ($opts->{source}) { - do_names_search( $keyword, \%sources, $sp_obj, + do_names_search( \@keywords, \%sources, $sp_obj, \&read_src_entry_all, $opts, \@results, \@non_results ); } else { - do_names_search( $keyword, \%packages, $p_obj, + do_names_search( \@keywords, \%packages, $p_obj, \&read_entry_all, $opts, \@results, \@non_results ); } -# } elsif ($searchon eq 'contents') { -# require "./search_contents.pl"; -# &contents($input); } else { - do_names_search( $keyword, \%packages, $p_obj, + do_names_search( \@keywords, \%packages, $p_obj, \&read_entry_all, $opts, \@results, \@non_results ); - do_fulltext_search( $keyword, "$DBDIR/descriptions.txt", + do_fulltext_search( \@keywords, "$DBDIR/descriptions.txt", \%did2pkg, \%packages, \&read_entry_all, $opts, \@results, \@non_results ); @@ -78,64 +76,69 @@ sub do_search { } # use Data::Dumper; -# debug( join( "", Dumper( \@results, \@non_results )) ); +# debug( join( "", Dumper( \@results, \@non_results )) ) if DEBUG; 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 $suite_wording = $suites_enc =~ /^(default|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) ); if ($searchon eq "names") { - my $source_wording = $opts->{source} ? "source " : ""; - my $exact_wording = $opts->{exact} ? "named" : "that names contain"; - msg( "You have searched for ${source_wording}packages $exact_wording $keyword_enc in $suite_wording, $section_wording, and $arch_wording." ); + my $source_wording = $opts->{source} ? _g("source packages") : _g("packages"); + # sorry to all translators for that one... (patches welcome) + msg( sprintf( _g( "You have searched for %s that names contain %s in %s, %s, and %s." ), + $source_wording, $keyword_enc, + $suite_wording, $section_wording, $arch_wording ) ); } else { - my $exact_wording = $opts->{exact} ? "" : " (including subword matching)"; - msg( "You have searched for $keyword_enc in packages names and descriptions in $suite_wording, $section_wording, and $arch_wording$exact_wording." ); + my $exact_wording = $opts->{exact} ? "" : _g(" (including subword matching)"); + msg( sprintf( _g( "You have searched for %s in packages names and descriptions in %s, %s, and %s%s." ), + $keyword_enc, + $suite_wording, $section_wording, $arch_wording, + $exact_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( sprintf( _g( "Your search was too wide so we will only display exact matches. At least %s results have been omitted and will not be displayed. Please consider using a longer keyword or more keywords." ), $Packages::Search::too_many_hits ) ); } if (!@Packages::CGI::fatal_errors && !@results) { - my $printed = 0; if ($searchon eq "names") { unless (@non_results) { - error( "Can't find that package." ); + error( _g( "Can't find that package." ) ); } else { - hint( "Can't find that package. ". - "". - ($#non_results+1)."". + hint( _g( "Can't find that package." )." ". + sprintf( _g( '%s'. " results have not been displayed due to the". - " search parameters." ); + " search parameters." ), "$SEARCH_URL/$keyword_esc" , + $#non_results+1 ) ); } } else { if (($suites_enc eq 'all') && ($archs_enc eq 'any') && ($sections_enc eq 'all')) { - error( "Can't find that string." ); + error( _g( "Can't find that string." ) ); } else { - error( "Can't find that string, at least not in that suite ($suites_enc, section $sections_enc) and on that architecture ($archs_enc)." ); + error( sprintf( _g( "Can't find that string, at least not in that suite (%s, section %s) and on that architecture (%s)." ), + $suites_enc, $sections_enc, $archs_enc ) ); } if ($opts->{exact}) { - $printed++; - hint( "You have searched only for words exactly matching your keywords. You can try to search {common_params}\">allowing subword matching." ); + hint( sprintf( _g( 'You have searched only for words exactly matching your keywords. You can try to search allowing subword matching.' ), + encode_entities(make_search_url('',"keywords=$keyword_esc",{exact => 0})) ) ); } } - hint( ( $printed ? "Or you" : "You" )." can try a different search on the Packages search page." ); + hint( sprintf( _g( 'You can try a different search on the Packages search page.' ), "$SEARCH_PAGE#search_packages" ) ); } - %$html_header = ( title => 'Package Search Results' , - lang => 'en', - title_tag => 'Debian Package Search Results', + %$html_header = ( title => _g( 'Package Search Results' ) , + lang => $opts->{lang}, + title_tag => _g( 'Debian Package Search Results' ), print_title => 1, print_search_field => 'packages', search_field_values => { @@ -160,27 +163,21 @@ sub do_search { my ($pkg) = $pkg_t =~ m/^(.+)/; # untaint if ($arch ne 'virtual') { - my $real_archive; - if ($archive =~ /^(security|non-US)$/) { - $real_archive = $archive; - $archive = 'us'; - } - - $pkgs{$pkg}{$suite}{$archive}{$version}{$arch} = 1; - $subsect{$pkg}{$suite}{$archive}{$version} = $subsection; - $sect{$pkg}{$suite}{$archive}{$version} = $section + $pkgs{$pkg}{$suite}{$version}{$arch} = 1; + $subsect{$pkg}{$suite}{$version} = $subsection; + $sect{$pkg}{$suite}{$version} = $section unless $section eq 'main'; - $archives{$pkg}{$suite}{$archive}{$version} = $real_archive - if $real_archive; + $archives{$pkg}{$suite}{$version} ||= $archive; - $desc{$pkg}{$suite}{$archive}{$version} = $desc; + $desc{$pkg}{$suite}{$version} = $desc; } else { - $provided_by{$pkg}{$suite}{$archive} = [ split /\s+/, $desc ]; + $provided_by{$pkg}{$suite} = [ split /\s+/, $desc ]; } } - my @pkgs = sort(keys %pkgs, keys %provided_by); - $$page_content .= print_packages( \%pkgs, \@pkgs, $opts, $keyword, + my %uniq_pkgs = map { $_ => 1 } (keys %pkgs, keys %provided_by); + my @pkgs = sort keys %uniq_pkgs; + $$page_content .= print_packages( \%pkgs, \@pkgs, $opts, \@keywords, \&print_package, \%provided_by, \%archives, \%sect, \%subsect, \%desc ); @@ -211,7 +208,7 @@ sub do_search { } my @pkgs = sort keys %pkgs; - $$page_content .= print_packages( \%pkgs, \@pkgs, $opts, $keyword, + $$page_content .= print_packages( \%pkgs, \@pkgs, $opts, \@keywords, \&print_src_package, \%archives, \%sect, \%subsect, \%binaries ); } # else unless $opts->{source} @@ -219,24 +216,27 @@ sub do_search { } # sub do_search sub print_packages { - my ($pkgs, $pkgs_list, $opts, $keyword, $print_func, @func_args) = @_; + my ($pkgs, $pkgs_list, $opts, $keywords, $print_func, @func_args) = @_; #my ($start, $end) = multipageheader( $input, scalar @pkgs, \%opts ); my $str = '
'; - $str .= "

Found ".(scalar @$pkgs_list)." matching packages."; + $str .= "

".sprintf( _g( "Found %s matching packages." ), + scalar @$pkgs_list )."

"; #my $count = 0; + my $keyword; + $keyword = $keywords->[0] if @$keywords == 1; my $have_exact; - if (grep { $_ eq $keyword } @$pkgs_list) { + if ($keyword && grep { $_ eq $keyword } @$pkgs_list) { $have_exact = 1; - $str .= '

Exact hits

'; + $str .= '

'._g( "Exact hits" ).'

'; $str .= &$print_func( $keyword, $pkgs->{$keyword}||{}, map { $_->{$keyword}||{} } @func_args ); @$pkgs_list = grep { $_ ne $keyword } @$pkgs_list; } if (@$pkgs_list && (($opts->{searchon} ne 'names') || !$opts->{exact})) { - $str .= '

Other hits

' + $str .= '

'._g( 'Other hits' ).'

' if $have_exact; foreach my $pkg (@$pkgs_list) { @@ -246,8 +246,9 @@ sub print_packages { map { $_->{$pkg}||{} } @func_args ); } } elsif (@$pkgs_list) { - $str .= "

{common_params}\">". - ($#{$pkgs_list}+1)." results have not been displayed because you requested only exact matches.

"; + $str .= "

".sprintf( _g( '%s results have not been displayed because you requested only exact matches.' ), + encode_entities(make_search_url('',"keywords=$opts->{keyword_esc}",{exact => 0})), + scalar @$pkgs_list )."

"; } $str .= '
'; @@ -257,48 +258,46 @@ sub print_packages { sub print_package { my ($pkg, $pkgs, $provided_by, $archives, $sect, $subsect, $desc) = @_; - my $str = sprintf "

Package %s

\n", $pkg; - $str .= "