Cleanup old stuff

[deb/packages.git] / cgi-bin / dispatcher.pl

diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl
index ea7c3e2fd6a988582be92e13b5b18fdd590de7b0..f03c55970aee3ebc5cd4d6e3702d30a3dc026fad 100755 (executable)
--- a/cgi-bin/dispatcher.pl
+++ b/cgi-bin/dispatcher.pl
@@ -16,7 +16,7 @@ use POSIX;
 use URI::Escape;
 use HTML::Entities;
 use DB_File;
-use Benchmark;
+use Benchmark ':hireswallclock';
 
 use Deb::Versions;
 use Packages::Config qw( $DBDIR $ROOT $SEARCH_CGI $SEARCH_PAGE
@@ -152,7 +152,7 @@ my %params_def = ( keywords => { default => undef,
                                    match => '^([\w-]+)$',
                                    array => ',', var => \@archives,
                                    replace => { all => \@ARCHIVES,
-                                            default => [qw(us security non-US)]} },
+                                                default => [qw(us security non-US)]} },
                   exact => { default => 0, match => '^(\w+)$',  },
                   source => { default => 0, match => '^(\d+)$',  },
                   searchon => { default => 'names', match => '^(\w+)$', },
@@ -163,7 +163,7 @@ my %params_def = ( keywords => { default => undef,
                   subsection => { default => 'default', match => '^([\w-]+)$',
                                   array => ',', var => \@subsections,
                                   replace => { default => [] } },
-                  arch => { default => 'any', match => '^(\w+)$',
+                  arch => { default => 'any', match => '^([\w-]+)$',
                             array => ',', var => \@archs, replace =>
                             { any => \@ARCHITECTURES } },
                   );