Move $debug_allowed to CGI as a real constant and modify all debug() calls

[deb/packages.git] / lib / Packages / DoSearchContents.pm

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index 67d2028dbd7fce371d67e71b44a67b1ebb9887ba..e86fc789783ef06dcecd7e9442535db7530f4c78 100644 (file)
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -12,6 +12,7 @@ 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;
@@ -22,15 +23,15 @@ 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( "suite not valid or not specified" );
+       fatal_error( _g( "suite not valid or not specified" ) );
     }
     if (@{$opts->{suite}} > 1) {
-       fatal_error( "more than one suite specified for contents search (@{$opts->{suite}})" );
+       fatal_error( sprintf( _g( "more than one suite specified for contents search (%s)" ), "@{$opts->{suite}}" ) );
     }
 
     $$menu = "";
@@ -74,7 +75,7 @@ sub do_search_contents {
            open FILENAMES, '-|', 'fgrep', '--', $kw, "$DBDIR/contents/filenames_$suite.txt"
                or die "Failed opening filename table: $!";
 
-           error( "Exact and fullfilenamesearch don't go along" )
+           error( _g( "Exact and fullfilenamesearch don't go along" ) )
                if $ffn and $exact;
 
            while (<FILENAMES>) {
@@ -98,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"
@@ -112,16 +113,16 @@ sub do_search_contents {
     msg( "You have searched for ${wording} <em>$keyword_enc</em> 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 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( "Nothing found" );
+       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 => { 
@@ -137,11 +138,14 @@ sub do_search_contents {
 
     $$page_content = '';
     if (@results) {
-       $$page_content .= "<p>Found ".scalar(@results)." results</p>";
-       $$page_content .= "<div  id=\"pcontentsres\"><table><colgroup><col><col></colgroup><tr><th>File</th><th>Packages</th></tr>";
+       $$page_content .= "<p>".sprintf( _g( 'Found %s results' ),
+                                        scalar @results )."</p>";
+       $$page_content .= '<div
+       id="pcontentsres"><table><colgroup><col><col></colgroup><tr><th>'._g('File').'</th><th>'._g('Packages')
+           .'</th></tr>';
        foreach my $result (sort { $a->[0] cmp $b->[0] } @results) {
            my $file = shift @$result;
-           $$page_content .= "<tr><td class=\"file\">$file</td><td>";
+           $$page_content .= "<tr><td class=\"file\">/$file</td><td>";
            my %pkgs;
            foreach (@$result) {
                my ($pkg, $arch) = split /:/, $_;
@@ -150,7 +154,7 @@ sub do_search_contents {
            $$page_content .= join( ", ", map { "<a href=\"$ROOT/$suite/$_\">$_</a>" } sort keys %pkgs);
            $$page_content .= '</td>';
        }
-       $$page_content .= '<tr><th>File</th><th>Packages</th></tr>' if @results > 20;
+       $$page_content .= '<tr><th>'._g('File').'</th><th>'._g('Packages').'</th></tr>' if @results > 20;
        $$page_content .= '</table></div>';
     }
 } # sub do_search_contents
@@ -160,7 +164,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)) {
@@ -168,7 +172,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 ];