Fix some minor issues

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

diff --git a/lib/Packages/DoSearchContents.pm b/lib/Packages/DoSearchContents.pm
index a11c11b84f16421aaf34d06d8718462c713615c5..7ae679826ca29ef004bdc6925f0291981ea26ac9 100644 (file)
--- a/lib/Packages/DoSearchContents.pm
+++ b/lib/Packages/DoSearchContents.pm
@@ -99,18 +99,20 @@ 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) <em>$suites_enc</em>";
-    my $section_wording = $sections_enc eq 'all' ? "all sections"
-       : "section(s) <em>$sections_enc</em>";
-    my $arch_wording = $archs_enc eq 'any' ? "all architectures"
-       : "architecture(s) <em>$archs_enc</em>";
-    my $wording = $opts->{exact} ? "exact filenames" : "filenames that contain";
-    $wording = "paths that end with" if $searchon eq "contents";
-    msg( "You have searched for ${wording} <em>$keyword_enc</em> in $suite_wording, $section_wording, and $arch_wording." );
+    my $suite_wording = $suites_enc eq "all" ? _g("all suites")
+       : sprintf(_g("suite(s) <em>%s</em>", $suites_enc) );
+    my $section_wording = $sections_enc eq 'all' ? _g("all sections")
+       : sprintf(_g("section(s) <em>%s</em>", $sections_enc) );
+    my $arch_wording = $archs_enc eq 'any' ? _g("all architectures")
+       : sprintf(_g("architecture(s) <em>%s</em>", $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 <em>%s</em> in %s, %s, and %s." ),
+                 $wording, $keyword_enc,
+                 $suite_wording, $section_wording, $arch_wording ) );
 
     if ($Packages::Search::too_many_hits) {
        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." ) );
@@ -145,7 +147,7 @@ sub do_search_contents {
            .'</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 /:/, $_;
@@ -164,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)) {
@@ -172,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 ];