X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=lib%2FPackages%2FDispatcher.pm;h=e2b64ad0e409db45ff486fc630825a9dc0ec01a7;hp=9d38c1788e63cf82b196d6950271261390c3bb35;hb=d833a5eed5296d1a24c35e8f0802f8291037198d;hpb=ee72025828634d9ebfbe2ab4a75849a3409d87da

diff --git a/lib/Packages/Dispatcher.pm b/lib/Packages/Dispatcher.pm
index 9d38c17..e2b64ad 100755
--- a/lib/Packages/Dispatcher.pm
+++ b/lib/Packages/Dispatcher.pm
@@ -15,7 +15,7 @@
 #
 #    You should have received a copy of the GNU General Public License
 #    along with this program; if not, write to the Free Software
-#    Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+#    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
 
 package Packages::Dispatcher;
 
@@ -65,6 +65,13 @@ sub do_dispatch {
     delete $ENV{'LC_ALL'};
     delete $ENV{'LC_MESSAGES'};
 
+    my %SUITES_ALIAS = ( oldstable => 'sarge',
+			 stable => 'etch',
+			 testing => 'lenny',
+			 unstable => 'sid',
+			 '3.1' => 'sarge',
+			 '4.0' => 'etch' );
+
     # Read in all the variables set by the form
     my $input;
     if ($ARGV[0] && ($ARGV[0] eq 'php')) {
@@ -168,14 +175,6 @@ sub do_dispatch {
 	    }
 
 	    my %SUITES = map { $_ => 1 } @SUITES;
-	    my %SUITES_ALIAS = ( sarge => 'oldstable',
-				 etch => 'stable',
-				 lenny => 'testing',
-				 sid => 'unstable',
-				 oldstable => 'sarge',
-				 stable => 'etch',
-				 testing => 'lenny',
-				 unstable => 'sid', );
 	    my %SECTIONS = map { $_ => 1 } @SECTIONS;
 	    my %ARCHIVES = map { $_ => 1 } @ARCHIVES;
 	    my %ARCHITECTURES = map { $_ => 1 } (@ARCHITECTURES, 'all', 'any');
@@ -206,8 +205,6 @@ sub do_dispatch {
 		    set_param_once( $input, \%params_set, 'archive', $_);
 		} elsif (!$need_pkg && $sections_descs{$_}) {
 		    set_param_once( $input, \%params_set, 'subsection', $_);
-		} elsif (!$need_pkg && ($_ eq 'non-us')) { # non-US hack
-		    set_param_once( $input, \%params_set, 'subsection', 'non-US');
 		} elsif (!$need_pkg && ($_ eq 'source')) {
 		    set_param_once( $input, \%params_set, 'source', 1);
 		} elsif ($ARCHITECTURES{$_}) {
@@ -227,8 +224,9 @@ sub do_dispatch {
 	} # else if (@components == 1)
 
 	if (@components) {
-	    $input->param( 'keywords', $components[0] );
-	    $input->param( 'package', $components[0] );
+	    my $c = uri_unescape($components[0]);
+	    $input->param( 'keywords', $c );
+	    $input->param( 'package', $c );
 	}
     }
 
@@ -244,7 +242,8 @@ sub do_dispatch {
 		       suite => { default => 'default', match => '^([\w-]+)$',
 				  array => ',', var => \@suites,
 				  replace => { all => \@SUITES,
-					       default => \@SUITES } },
+					       default => \@SUITES,
+					       %SUITES_ALIAS } },
 		       archive => { default => ($what_to_do eq 'search') ?
 					'all' : 'default',
 					match => '^([\w-]+)$',
@@ -270,7 +269,7 @@ sub do_dispatch {
 				 array => ',', var => \@archs, replace =>
 				 { any => \@ARCHITECTURES } },
 		       format => { default => 'html', match => '^([\w.]+)$',  },
-		   mode => { default => undef, match => '^(\w+)$',  },
+		   mode => { default => '', match => '^(\w+)$',  },
 		   sort_by => { default => 'file', match => '^(\w+)$', },
 		   );
     my %opts;
@@ -315,7 +314,9 @@ Packages::CGI::init_url( $input, \%params, \%opts );
 					     debug => ( DEBUG ? $opts{debug} : 0 ) },
 					   ( $CACHEDIR ? { COMPILE_DIR => $CACHEDIR } : {} ) );
 
-    unless (-e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") {
+    #FIXME: ugly hack
+    unless (($what_to_do eq 'allpackages' and $opts{format} =~ /^(html|txt\.gz)/)
+            || -e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") {
 	fatal_error( "requested format not available for this document",
 		     "406 requested format not available");
     }