* completly overhaul URL generating. Now things like debug or language

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

diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index c1c544690ae3ffc21c7ae85f046284c4b06086cb..a889ef5ca89870fc2d8f35430e22906f772262fa 100644 (file)
--- a/lib/Packages/DoSearch.pm
+++ b/lib/Packages/DoSearch.pm
@@ -39,10 +39,7 @@ sub do_search {
 
     # for URL construction
     my $keyword_esc = uri_escape( $keyword );
-    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->{keywords_esc} = $keyword_esc;
 
     # for output
     my $keyword_enc = encode_entities $keyword || '';
@@ -134,7 +131,7 @@ sub do_search {
            
            if ($opts->{exact}) {
                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}") ) );
+                              encode_entities(make_search_url('',"keywords=$keyword_esc",{exact => 0})) ) );
            }
        }
        hint( sprintf( _g( 'You can try a different search on the <a href="%s">Packages search page</a>.' ), "$SEARCH_PAGE#search_packages" ) );
@@ -168,26 +165,20 @@ 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 ];
                }
            }
 
-           my @pkgs = sort(keys %pkgs, keys %provided_by);
+           my %uniq_pkgs = map { $_ => 1 } (keys %pkgs, keys %provided_by);
+           my @pkgs = sort keys %uniq_pkgs;
            $$page_content .= print_packages( \%pkgs, \@pkgs, $opts, $keyword,
                                              \&print_package, \%provided_by,
                                              \%archives, \%sect, \%subsect,
@@ -256,7 +247,7 @@ sub print_packages {
        }
     } elsif (@$pkgs_list) {
        $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}"),
+                              encode_entities(make_search_url('',"keywords=$opts->{keyword_esc}",{exact => 0})),
                               scalar @$pkgs_list )."</p>";
     }
     $str .= '</div>';
@@ -270,45 +261,43 @@ 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 $override = { suite => $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 );
+               $str .= sprintf( "<li><a href=\"%s\">%s</a> (%s): %s   %s\n",
+                                make_url($pkg,'',$override), $suite, $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);
+                       join( ', ', map { "<a href=\"".
+                                             make_url($_,'',$override)."\">$_</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 );
+           } elsif (my $p =  $provided_by->{$suite}) {
+               $str .= sprintf( "<li><a href=\"%s\">%s</a>: "._g('Virtual package').'<br>',
+                                make_url($pkg,'',$override), $suite );
                $str .= _g( 'provided by: ' ).
-                   join( ', ', map { "<a href=\"$ROOT/$path/$_\">$_</a>"  } @$p);
+                   join( ', ', map { "<a href=\"".
+                                         make_url($_,'',$override)."\">$_</a>"  } @$p);
            }
-       }
     }
     $str .= "</ul>\n";
     return $str;