Display the index pages from within dispatcher.pl. That reduces the complexity

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

diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl
index 3873c4996efbb442b519a3a6caaf04a93a6572c6..99c547998e54ac98405383c8ec4190e62665fd63 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;
 
@@ -54,9 +55,7 @@ if ($ARGV[0] && ($ARGV[0] eq 'php')) {
 
 my $pet0 = new Benchmark;
 my $tet0 = new Benchmark;
-# use this to disable debugging in production mode completly
-my $debug_allowed = 1;
-my $debug = $debug_allowed && $input->param("debug");
+my $debug = DEBUG && $input->param("debug");
 $debug = 0 if !defined($debug) || $debug !~ /^\d+$/o;
 $Packages::CGI::debug = $debug;
 
@@ -77,17 +76,19 @@ 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 );
     }
-    if (@components > 0 and $components[0] eq 'search') {
+    if (@components > 1 and $components[0] eq 'search') {
        shift @components;
        $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) {
@@ -95,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;
@@ -192,14 +193,14 @@ my %params = Packages::Search::parse_params( $input, \%params_def, \%opts );
 my $locale = get_locale($opts{lang});
 my $charset = get_charset($opts{lang});
 setlocale ( LC_ALL, $locale )
-    or do { debug( "couldn't set locale $locale, using default" );
+    or do { debug( "couldn't set locale $locale, using default" ) if DEBUG;
            setlocale( LC_ALL, get_locale() )
                or do {
-                   debug( "couldn't set default locale either" );
+                   debug( "couldn't set default locale either" ) if DEBUG;
                    setlocale( LC_ALL, "C" );
                };
        };
-debug( "locale=$locale charset=$charset", 2 );
+debug( "locale=$locale charset=$charset", 2 ) if DEBUG;
 
 $opts{h_suites} = { map { $_ => 1 } @suites };
 $opts{h_sections} = { map { $_ => 1 } @sections };
@@ -220,9 +221,7 @@ if ($opts{searchon} eq 'contents' or $opts{searchon} eq 'filenames') {
 
 my $pet1 = new Benchmark;
 my $petd = timediff($pet1, $pet0);
-debug( "Parameter evaluation took ".timestr($petd) );
-
-print $input->header( -charset => $charset );
+debug( "Parameter evaluation took ".timestr($petd) ) if DEBUG;
 
 my (%html_header, $menu, $page_content);
 unless (@Packages::CGI::fatal_errors) {
@@ -246,13 +245,15 @@ unless (@Packages::CGI::fatal_errors) {
                     );
 }
 
+print $input->header( -charset => $charset );
+
 print Packages::HTML::header( %html_header );
 
 print $menu||'';
 print_errors();
 print_hints();
 print_msgs();
-print_debug();
+print_debug() if DEBUG;
 print_notes();
 
 unless (@Packages::CGI::fatal_errors) {
@@ -262,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