dispatcher: Update suite aliases for etch release

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

diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl
index 45d1b463154539b9c20dc63c71e3b5eb40285650..11a1d590a97f3e33c838436550780562d7aa00d2 100755 (executable)
--- a/cgi-bin/dispatcher.pl
+++ b/cgi-bin/dispatcher.pl
@@ -58,6 +58,11 @@ if ($ARGV[0] && ($ARGV[0] eq 'php')) {
 } else {
        $input = new CGI;
 }
+my $cgi_error = $input->cgi_error;
+if ($cgi_error) {
+    fatal_error( "Error parsing the request", $cgi_error );
+}
+
 
 my $pet0 = new Benchmark;
 my $tet0 = new Benchmark;
@@ -114,9 +119,9 @@ if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
        }
 
        my %SUITES = map { $_ => 1 } @SUITES;
-       my %SUITES_ALIAS = ( woody => 'oldstable',
-                            sarge => 'stable',
-                            etch => 'testing',
+       my %SUITES_ALIAS = ( sarge => 'oldstable',
+                            etch => 'stable',
+                            lenny => 'testing',
                             sid => 'unstable', );
        my %SECTIONS = map { $_ => 1 } @SECTIONS;
        my %ARCHIVES = map { $_ => 1 } @ARCHIVES;
@@ -253,6 +258,11 @@ debug( "Parameter evaluation took ".timestr($petd) ) if DEBUG;
 
 my $template = new Packages::Template( $TEMPLATEDIR, $opts{format}, { lang => $opts{lang}, charset => $charset, debug => ( DEBUG ? $opts{debug} : 0 ) }, ( $CACHEDIR ? { COMPILE_DIR => $CACHEDIR } : {} ) );
 
+unless (-e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") {
+    fatal_error( "requested format not available for this document",
+                "405 requested format not available");
+}
+
 my (%html_header, %page_content);
 unless (@Packages::CGI::fatal_errors) {
     no strict 'refs';
@@ -269,22 +279,25 @@ $page_content{make_url} = sub { return &Packages::CGI::make_url(@_) };
 $page_content{html_encode} = sub { return HTML::Entities::encode_entities(@_,'<>&"') };
 $page_content{uri_escape} = sub { return URI::Escape::uri_escape(@_) };
 $page_content{quotemeta} = sub { return quotemeta($_[0]) };
-
-print $input->header( -charset => $charset );
-
-#use Data::Dumper;
-#print '<pre>'.Dumper(\%ENV, \%html_header, \%page_content, get_all_messages()).'</pre>';
+$page_content{string2id} = sub { return &Packages::CGI::string2id(@_) };
 
 unless (@Packages::CGI::fatal_errors) {
-print $template->page( $what_to_do, { %page_content, %{ get_all_messages() } } );
+    print $input->header(-charset => $charset, -type => get_mime($opts{format}) );
+    #use Data::Dumper;
+    #print '<pre>'.Dumper(\%ENV, \%html_header, \%page_content, get_all_messages()).'</pre>';
+    print $template->page( $what_to_do, { %page_content, %{ get_all_messages() } } );
+    my $tet1 = new Benchmark;
+    my $tetd = timediff($tet1, $tet0);
+    print $template->trailer( undef, undef, undef, $tetd );
+} elsif ($Packages::CGI::http_code) {
+    print $input->header( -charset => $charset, -status => $Packages::CGI::http_code );
 } else {
-print $template->error_page( get_all_messages() );
+    # We currently have only an error page in html
+    # so no format support here
+    print $input->header( -charset => $charset );
+    print $template->error_page( get_all_messages() );
+    print $template->trailer();;
 }
 
-my $tet1 = new Benchmark;
-my $tetd = timediff($tet1, $tet0);
-
-my $trailer = $template->trailer( undef, undef, undef, $tetd );
-print $trailer;
 
 # vim: ts=8 sw=4