dispatcher: Fix handling of Packages::CGI::http_code vs. error page

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

diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl
index b72e443615e5b0e8e2ad1cfe61f3048122f75ed2..b563dc55ba464197075a980abe1df45e75d9d295 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;
@@ -78,6 +83,11 @@ debug( "LANGUAGES=@LANGUAGES header=".
 bindtextdomain ( 'pdo', $LOCALES );
 textdomain( 'pdo' );
 
+if ($ENV{is_reportbug}) {
+    $input->param('exact', 1);
+    debug( "reportbug detected, set paramater exact to '1'" ) if DEBUG;
+}
+
 my $what_to_do = 'show';
 my $source = 0;
 if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
@@ -114,13 +124,13 @@ 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;
-       my %ARCHITECTURES = map { $_ => 1 } (@ARCHITECTURES, 'all');
+       my %ARCHITECTURES = map { $_ => 1 } (@ARCHITECTURES, 'all', 'any');
        my %PRIORITIES = map { $_ => 1 } @PRIORITIES;
        my %params_set;
        sub set_param_once {
@@ -153,7 +163,8 @@ if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
            } elsif (!$need_pkg && ($_ eq 'source')) {
                set_param_once( $input, \%params_set, 'source', 1);
            } elsif ($ARCHITECTURES{$_}) {
-               set_param_once( $input, \%params_set, 'arch', $_);
+               set_param_once( $input, \%params_set, 'arch', $_)
+                   unless $_ eq 'any';
            } elsif ($PRIORITIES{$_}) {
                set_param_once( $input, \%params_set, 'priority', $_);
            } else {
@@ -253,6 +264,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",
+                "406 requested format not available");
+}
+
 my (%html_header, %page_content);
 unless (@Packages::CGI::fatal_errors) {
     no strict 'refs';
@@ -271,21 +287,23 @@ $page_content{uri_escape} = sub { return URI::Escape::uri_escape(@_) };
 $page_content{quotemeta} = sub { return quotemeta($_[0]) };
 $page_content{string2id} = sub { return &Packages::CGI::string2id(@_) };
 
-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>';
-
 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 && $Packages::CGI::http_code !~ /^2\d\d/) {
+    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