Clean-up behind Jeroen :)

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

diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl
index a4b3e3960aec19ab46735e4d6bd9b977549211ee..e863de91b172aa0ff94823e9fc4d0218b4e9f71f 100755 (executable)
--- a/cgi-bin/dispatcher.pl
+++ b/cgi-bin/dispatcher.pl
@@ -32,6 +32,7 @@ use Packages::I18N::Locale;
 use Packages::DoSearch;
 use Packages::DoSearchContents;
 use Packages::DoShow;
+use Packages::DoIndex;
 use Packages::DoDownload;
 use Packages::DoFilelist;
 
@@ -66,7 +67,7 @@ my $http_lang = $acc->accepts( $input->http("Accept-Language"),
                               \@LANGUAGES );
 debug( "LANGUAGES=@LANGUAGES header=".
        $input->http("Accept-Language").
-       " http_lang=$http_lang", 2 );
+       " http_lang=$http_lang", 2 ) if DEBUG;
 bindtextdomain ( 'pdo', $LOCALES );
 textdomain( 'pdo' );
 
@@ -75,7 +76,9 @@ my $source = 0;
 if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
     my @components = grep { $_ } map { lc $_ } split /\/+/, $path;
 
-    debug( "components[0]=$components[0]", 2 ) if @components>0;
+    push @components, 'index' if $path =~ m,/$,;
+
+    debug( "components[0]=$components[0]", 2 ) if DEBUG and @components>0;
     if (@components > 0 and $components[0] eq 'source') {
        shift @components;
        $input->param( 'source', 1 );
@@ -85,7 +88,7 @@ if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
        $what_to_do = 'search';
        # Done
        fatal_error( _g( "search doesn't take any more path elements" ) )
-           if @components > 0;
+           if @components;
     } elsif (@components == 0) {
        fatal_error( _g( "We're supposed to display the homepage here, instead of getting dispatch.pl" ) );
     } elsif (@components == 1) {
@@ -93,7 +96,7 @@ if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
     } else {
 
        for ($components[-1]) {
-           /^(changelog|copyright|download|filelist)$/ && do {
+           /^(index|changelog|copyright|download|filelist)$/ && do {
                pop @components;
                $what_to_do = $1;
                last;
@@ -168,7 +171,7 @@ my %params_def = ( keywords => { default => undef,
                                    match => '^([\w-]+)$',
                                    array => ',', var => \@archives,
                                    replace => { all => \@ARCHIVES,
-                                                default => [qw(us security non-US)]} },
+                                                default => \@ARCHIVES} },
                   exact => { default => 0, match => '^(\w+)$',  },
                   lang => { default => $http_lang, match => '^(\w+)$',  },
                   source => { default => 0, match => '^(\d+)$',  },
@@ -220,8 +223,6 @@ my $pet1 = new Benchmark;
 my $petd = timediff($pet1, $pet0);
 debug( "Parameter evaluation took ".timestr($petd) ) if DEBUG;
 
-print $input->header( -charset => $charset );
-
 my (%html_header, $menu, $page_content);
 unless (@Packages::CGI::fatal_errors) {
     no strict 'refs';
@@ -244,6 +245,8 @@ unless (@Packages::CGI::fatal_errors) {
                     );
 }
 
+print $input->header( -charset => $charset );
+
 print Packages::HTML::header( %html_header );
 
 print $menu||'';
@@ -260,7 +263,7 @@ unless (@Packages::CGI::fatal_errors) {
 my $tet1 = new Benchmark;
 my $tetd = timediff($tet1, $tet0);
 print "Total page evaluation took ".timestr($tetd)."<br>"
-    if $debug_allowed;
+    if DEBUG;
 
 my $trailer = Packages::HTML::trailer( $ROOT );
 $trailer =~ s/LAST_MODIFIED_DATE/gmtime()/e; #FIXME