From 32f5a5ba7f66aedf7afc095dce485073fe030b88 Mon Sep 17 00:00:00 2001 From: Frank Lichtenheld Date: Fri, 24 Nov 2006 01:31:51 +0000 Subject: [PATCH] Move more messages from DoSearch.pm to search.tmpl, similar to what I've already done for search_contents.tmpl --- lib/Packages/DoSearch.pm | 93 ++++------------------------- templates/html/search.tmpl | 70 +++++++++++++++++++++- templates/html/search_contents.tmpl | 2 +- 3 files changed, 79 insertions(+), 86 deletions(-) diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm index 2a59937..2603ff9 100644 --- a/lib/Packages/DoSearch.pm +++ b/lib/Packages/DoSearch.pm @@ -14,7 +14,7 @@ our @EXPORT = qw( do_search ); use Deb::Versions; use Packages::I18N::Locale; use Packages::Search qw( :all ); -use Packages::CGI qw( :DEFAULT msg error ); +use Packages::CGI qw( :DEFAULT ); use Packages::DB; use Packages::Config qw( $DBDIR @SUITES @ARCHIVES $ROOT ); @@ -32,18 +32,8 @@ sub do_search { my @keywords = @{$opts->{keywords}}; my $searchon = $opts->{searchon}; + $page_content->{search_keywords} = \@keywords; - # for URL construction - my $keyword_esc = uri_escape( "@keywords" ); - $opts->{keywords_esc} = $keyword_esc; - - # for output - 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}} ) ); - my $archs_enc = encode_entities( join( ', ', @{$params->{values}{arch}{no_replace}} ) ); - my $st0 = new Benchmark; my (@results, @non_results); @@ -69,80 +59,17 @@ sub do_search { \@results, \@non_results ); } } - + # use Data::Dumper; # debug( join( "", Dumper( \@results, \@non_results )) ) if DEBUG; my $st1 = new Benchmark; my $std = timediff($st1, $st0); debug( "Search took ".timestr($std) ) if DEBUG; - - 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} ? _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} ? "" : _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( 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) { - if ($searchon eq "names") { - unless (@non_results) { - error( _g( "Can't find that package." ) ); - } else { -# hint( _g( "Can't find that package." )." ". -# sprintf( _g( '%s'. -# " results have not been displayed due to the". -# " search parameters." ), "$SEARCH_URL/$keyword_esc" , -# $#non_results+1 ) ); - } - - } else { - if (($suites_enc eq 'all') - && ($archs_enc eq 'any') - && ($sections_enc eq 'all')) { - error( _g( "Can't find that string." ) ); - } else { - 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}) { - 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( sprintf( _g( 'You can try a different search on the Packages search page.' ), "$SEARCH_PAGE#search_packages" ) ); - - } - - $page_content->{make_url} = sub { return &Packages::CGI::make_url(@_) }; - $page_content->{make_search_url} = sub { return &Packages::CGI::make_search_url(@_) }; - $page_content->{search_field_values} = { - keywords => $keyword_enc, - searchon => $opts->{searchon_form}, - arch => $archs_enc, - suite => $suites_enc, - section => $sections_enc, - exact => $opts->{exact}, - debug => $opts->{debug}, - }; + $page_content->{too_many_hits} = $Packages::Search::too_many_hits; + #FIXME: non_results can't be compared to results since it is + # not normalized to unique packages + $page_content->{non_results} = scalar @non_results; if (@results) { my (%pkgs, %subsect, %sect, %archives, %desc, %binaries, %provided_by); @@ -151,14 +78,14 @@ sub do_search { foreach (@results) { my ($pkg_t, $archive, $suite, $arch, $section, $subsection, $priority, $version, $desc) = @$_; - + my ($pkg) = $pkg_t =~ m/^(.+)/; # untaint if ($arch ne 'virtual') { $pkgs{$pkg}{$suite}{$version}{$arch} = 1; $subsect{$pkg}{$suite}{$version} = $subsection; $sect{$pkg}{$suite}{$version} = $section; $archives{$pkg}{$suite}{$version} ||= $archive; - + $desc{$pkg}{$suite}{$version} = $desc; } else { $provided_by{$pkg}{$suite} = [ split /\s+/, $desc ]; @@ -176,7 +103,7 @@ sub do_search { foreach (@results) { my ($pkg, $archive, $suite, $section, $subsection, $priority, $version) = @$_; - + my $real_archive = ''; if ($archive =~ /^(security|non-US)$/) { $real_archive = $archive; diff --git a/templates/html/search.tmpl b/templates/html/search.tmpl index e5105bf..6425cbf 100644 --- a/templates/html/search.tmpl +++ b/templates/html/search.tmpl @@ -2,13 +2,79 @@ [%- PROCESS 'html/head.tmpl' title_tag = 'Debian Package Search Results' print_search_field = 'packages' + search_field_values = { + keywords => search_keywords.join(' '), + searchon => opts.searchon_form, + suite => params.values.suite.no_replace.join(','), + architectures => params.values.arch.no_replace.join(','), + sections => params.values.section.no_replace.join(','), + }; + navigation = [ { name => 'Package Search Results' } ] -%] +[% keyword_str = search_keywords.join(' '); + keyword_esc = uri_escape(keyword_str); + keyword_enc = html_encode(keyword_str); + + section_str = params.values.section.no_replace.join(', '); + section_esc = uri_escape(section_str); + section_enc = html_encode(section_str); + + suite_str = params.values.suite.no_replace.join(', '); + suite_esc = uri_escape(suite_str); + suite_enc = html_encode(suite_str); + + architectures_str = params.values.arch.no_replace.join(', '); + architectures_esc = uri_escape(architectures_str); + architectures_enc = html_encode(architectures_str); +%] + +
+[% UNLESS results %] +

You can try a different search on the Packages search page.

+ + [% IF opts.searchon != "names" && opts.exact %] +

You have searched only for words exactly matching your keywords. + You can try to search allowing subword matching + [% END %] +[% END %] +[% IF opts.searchon == "names" && non_results %] +

[% non_results %] +results have not been displayed due to the search parameters.

+[% END %] +
+ [%- PROCESS 'html/messages.tmpl' -%]
-

Found [% results %] matching packages.

+ +[% suite_wording = suite_enc.match("^(default|all)$") ? "all suites" : "suite(s) $suite_enc"; + section_wording = (section_enc == 'all') ? "all sections" : "section(s) $section_enc"; + arch_wording = (architectures_enc == 'any') ? "all architectures" : "architecture(s) $architectures_enc"; + IF opts.searchon == "names"; + source_wording = opts.source ? "source packages" : "packages"; + msg = "You have searched for $source_wording that names contain $keyword_enc in $suite_wording, $section_wording, and $arch_wording ."; + ELSE; + 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 ."; + END %] +

[% msg %] + +[% IF results %] +Found [% results %] matching packages.

+[% END %] + +[% IF too_many_hits %] +

Your search was too wide so we will only display exact matches. +At least [% too_many_hits %] results have been omitted and will not be displayed. +Please consider using a longer keyword or more keywords.

+[% END %] + +[% UNLESS results %] +

Sorry, your search gave no results

+[% END %] + [% FOREACH categories %] [% "

$name

" IF name %] @@ -16,7 +82,7 @@

Package [% pkg %]