X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDoSearch.pm;h=776b288fd9745169e84582b15fa3a2db85c1ec6d;hp=d8aa6d8194dbe97ffccffefaf83395052058db12;hb=f27f1fcc5bffc0696f694e962eb40dbb0c554855;hpb=47c93cb066364b11f0b216589ddc68671435b060

diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index d8aa6d8..776b288 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,9 +27,9 @@ sub do_search {
     $Params::Search::too_many_hits = 0;
 
     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)" ) );
     }
 
     $$menu = "";
@@ -39,7 +42,7 @@ sub do_search {
     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";
+    $opts->{common_params} = "suite=$suites_param&section=$sections_param&keywords=$keyword_esc&searchon=$searchon&arch=$archs_param";
 
     # for output
     my $keyword_enc = encode_entities $keyword || '';
@@ -78,10 +81,10 @@ 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) <em>$suites_enc</em>";
@@ -99,43 +102,43 @@ sub do_search {
     }
 
     if ($Packages::Search::too_many_hits) {
-	error( "Your search was too wide so we will only display exact matches. At least <em>$Packages::Search::too_many_hits</em> 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 <em>%s</em> 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. ".
-		      "<a href=\"$SEARCH_URL/$keyword_esc\">".
-		      ($#non_results+1)."</a>".
+		hint( _g( "Can't find that package." )." ".
+		      sprintf( _g( '<a href="%s">%s</a>'.
 		      " 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 <a href=\"$SEARCH_URL?exact=0;$opts->{common_params}\">allowing subword matching</a>." );
+		hint( sprintf( _g( 'You have searched only for words exactly matching your keywords. You can try to search <a href="%s">allowing subword matching</a>.' ),
+			       encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}") ) );
 	    }
 	}
-	hint( ( $printed ? "Or you" : "You" )." can try a different search on the <a href=\"$SEARCH_PAGE#search_packages\">Packages search page</a>." );
+	hint( sprintf( _g( 'You can try a different search on the <a href="%s">Packages search page</a>.' ), "$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 => { 
@@ -223,20 +226,21 @@ sub print_packages {
 
     #my ($start, $end) = multipageheader( $input, scalar @pkgs, \%opts );
     my $str = '<div id="psearchres">';
-    $str .= "<p>Found <em>".(scalar @$pkgs_list)."</em> matching packages.";
+    $str .= "<p>".sprintf( _g( "Found <em>%s</em> matching packages." ),
+			   scalar @$pkgs_list )."</p>";
     #my $count = 0;
 	    
     my $have_exact;
     if (grep { $_ eq $keyword } @$pkgs_list) {
 	$have_exact = 1;
-	$str .= '<h2>Exact hits</h2>';
+	$str .= '<h2>'._g( "Exact hits" ).'</h2>';
 	$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 .= '<h2>Other hits</h2>'
+	$str .= '<h2>'._g( 'Other hits' ).'</h2>'
 	    if $have_exact;
 	
 	foreach my $pkg (@$pkgs_list) {
@@ -246,8 +250,9 @@ sub print_packages {
 				  map { $_->{$pkg}||{} } @func_args );
 	}
     } elsif (@$pkgs_list) {
-	$str .= "<p><a href=\"$SEARCH_URL?exact=0;$opts->{common_params}\">".
-	    ($#{$pkgs_list}+1)."</a> results have not been displayed because you requested only exact matches.</p>";
+	$str .= "<p>".sprintf( _g( '<a href="%s">%s</a> results have not been displayed because you requested only exact matches.' ),
+			       encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}"),
+			       scalar @$pkgs_list )."</p>";
     }
     $str .= '</div>';
 
@@ -257,8 +262,8 @@ sub print_packages {
 sub print_package {
     my ($pkg, $pkgs, $provided_by, $archives, $sect, $subsect, $desc) = @_;
 
-    my $str = sprintf "<h3>Package %s</h3>\n", $pkg;
-    $str .= "<ul>\n";
+    my $str = '<h3>'.sprintf( _g( 'Package %s' ), $pkg ).'</h3>';
+    $str .= '<ul>';
     foreach my $suite (@SUITES) {
 	foreach my $archive (@ARCHIVES) {
 	    next if $archive eq 'security';
@@ -288,14 +293,14 @@ sub print_package {
 		    $archs_printed{$_}++ foreach @archs_to_print;
 		}
 		if (my $p =  $provided_by->{$suite}{$archive}) {
-		    $str .= '<br>also provided by: '.
+		    $str .= '<br>'._g( 'also provided by: ' ).
 			join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>"  } @$p);
 		}
 		$str .= "</li>\n";
 	    } elsif (my $p =  $provided_by->{$suite}{$archive}) {
 		$str .= sprintf( "<li><a href=\"$ROOT/%s/%s\">%s</a>: Virtual package<br>",
 				 $path, $pkg, $path );
-		$str .= 'provided by: '.
+		$str .= _g( 'provided by: ' ).
 		    join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>"  } @$p);
 	    }
 	}
@@ -307,7 +312,7 @@ sub print_package {
 sub print_src_package {
     my ($pkg, $pkgs, $archives, $sect, $subsect, $binaries) = @_;
 
-    my $str = sprintf "<h3>Source package %s</h3>\n", $pkg;
+    my $str = '<h3>'.sprintf( _g( 'Source package %s' ), $pkg ).'</h3>';
     $str .= "<ul>\n";
     foreach my $suite (@SUITES) {
 	foreach my $archive (@ARCHIVES) {
@@ -323,7 +328,7 @@ sub print_src_package {
 				 $suite.(($archive ne 'us')?"/$archive":''), $pkg, $suite.(($archive ne 'us')?"/$archive":''), $subsect->{$suite}{$archive}{source},
 				 $pkgs->{$suite}{$archive}, $origin_str );
 		
-		$str .= "<br>Binary packages: ";
+		$str .= "<br>"._g( 'Binary packages: ' );
 		my @bp_links;
 		foreach my $bp (@{$binaries->{$suite}{$archive}}) {
 		    my $bp_link = sprintf( "<a href=\"$ROOT/%s/%s\">%s</a>",