Simply some stuff due to (suite,arch) now being unique and $archive being

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

diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index 776b288fd9745169e84582b15fa3a2db85c1ec6d..f55f2cf7e05d28c29788fe6abe96b6b06d724ba4 100644 (file)
--- a/lib/Packages/DoSearch.pm
+++ b/lib/Packages/DoSearch.pm
@@ -86,19 +86,24 @@ sub do_search {
     my $std = timediff($st1, $st0);
     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 $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) );
     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 <em>$keyword_enc</em> 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 <em>%s</em> 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 <em>$keyword_enc</em> 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 <em>%s</em> 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) {
@@ -163,22 +168,15 @@ 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 ];
                }
            }
 
@@ -265,45 +263,41 @@ sub print_package {
     my $str = '<h3>'.sprintf( _g( 'Package %s' ), $pkg ).'</h3>';
     $str .= '<ul>';
     foreach my $suite (@SUITES) {
-       foreach my $archive (@ARCHIVES) {
-           next if $archive eq 'security';
-           next if $archive eq 'non-US';
-           my $path = $suite.(($archive ne 'us')?"/$archive":'');
-           if (exists $pkgs->{$suite}{$archive}) {
+           my $path = $suite;
+           if (exists $pkgs->{$suite}) {
                my %archs_printed;
-               my @versions = version_sort keys %{$pkgs->{$suite}{$archive}};
+               my @versions = version_sort keys %{$pkgs->{$suite}};
                my $origin_str = "";
-               if ($sect->{$suite}{$archive}{$versions[0]}) {
-                   $origin_str .= " ".marker($sect->{$suite}{$archive}{$versions[0]});
+               if ($sect->{$suite}{$versions[0]}) {
+                   $origin_str .= " ".marker($sect->{$suite}{$versions[0]});
                }
                $str .= sprintf( "<li><a href=\"$ROOT/%s/%s\">%s</a> (%s): %s   %s\n",
-                                $path, $pkg, $path, $subsect->{$suite}{$archive}{$versions[0]},
-                                $desc->{$suite}{$archive}{$versions[0]}, $origin_str );
+                                $path, $pkg, $path, $subsect->{$suite}{$versions[0]},
+                                $desc->{$suite}{$versions[0]}, $origin_str );
                
                foreach my $v (@versions) {
                    my $archive_str = "";
-                   if ($archives->{$suite}{$archive}{$v}) {
-                       $archive_str .= " ".marker($archives->{$suite}{$archive}{$v});
+                   if ($archives->{$suite}{$v} ne 'us') {
+                       $archive_str .= " ".marker($archives->{$suite}{$v});
                    }
                    
-                   my @archs_to_print = grep { !$archs_printed{$_} } sort keys %{$pkgs->{$suite}{$archive}{$v}};
+                   my @archs_to_print = grep { !$archs_printed{$_} } sort keys %{$pkgs->{$suite}{$v}};
                    $str .= sprintf( "<br>%s$archive_str: %s\n",
                                     $v, join (" ", @archs_to_print ))
                        if @archs_to_print;
                    $archs_printed{$_}++ foreach @archs_to_print;
                }
-               if (my $p =  $provided_by->{$suite}{$archive}) {
+               if (my $p =  $provided_by->{$suite}) {
                    $str .= '<br>'._g( 'also provided by: ' ).
                        join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>"  } @$p);
                }
                $str .= "</li>\n";
-           } elsif (my $p =  $provided_by->{$suite}{$archive}) {
+           } elsif (my $p =  $provided_by->{$suite}) {
                $str .= sprintf( "<li><a href=\"$ROOT/%s/%s\">%s</a>: Virtual package<br>",
                                 $path, $pkg, $path );
                $str .= _g( 'provided by: ' ).
                    join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>"  } @$p);
            }
-       }
     }
     $str .= "</ul>\n";
     return $str;