X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDoSearch.pm;h=efefa975ad6ca5848c82ca94aeaacfb45201650b;hp=1aa67f1d327bf3f10a5e7da9730a628320862f8b;hb=a6b39cb5eec2cf7d8a0d756f0090a9d8644443c9;hpb=35396b36e9658cb7346fb080531fff92a6d0fd57

diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index 1aa67f1..efefa97 100644
--- a/lib/Packages/DoSearch.pm
+++ b/lib/Packages/DoSearch.pm
@@ -10,11 +10,10 @@ our @ISA = qw( Exporter );
 our @EXPORT = qw( do_search );
 
 use Deb::Versions;
-use Packages::I18N::Locale;
 use Packages::Search qw( :all );
 use Packages::CGI qw( :DEFAULT );
 use Packages::DB;
-use Packages::Config qw( $DBDIR @SUITES @ARCHIVES $ROOT );
+use Packages::Config qw( $DBDIR @SUITES @ARCHIVES @ARCHITECTURES $ROOT );
 
 sub do_search {
     my ($params, $opts, $page_content) = @_;
@@ -31,7 +30,12 @@ sub do_search {
 
     my @keywords = @{$opts->{keywords}};
     my $searchon = $opts->{searchon};
-    $page_content->{search_keywords} = \@keywords;
+    $page_content->{search_keywords} = $opts->{keywords};
+    $page_content->{all_architectures} = \@ARCHITECTURES;
+    $page_content->{all_suites} = \@SUITES;
+    $page_content->{search_architectures} = $opts->{arch};
+    $page_content->{search_suites} = $opts->{suite};
+    $page_content->{sections} = $opts->{section};
 
     my $st0 = new Benchmark;
     my (@results, @non_results);
@@ -127,8 +131,7 @@ sub do_search {
 		    $real_archive = $archive;
 		    $archive = 'us';
 		}
-		if (($real_archive eq $archive) &&
-		    $pkgs{$pkg}{$suite}{$archive} &&
+		if ($pkgs{$pkg}{$suite}{$archive} &&
 		    (version_cmp( $pkgs{$pkg}{$suite}{$archive}, $version ) >= 0)) {
 		    next;
 		}