X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=cgi-bin%2Fdispatcher.pl;h=254f0b6da3bdf116931f55dd2e3f5f12b1e4ccd2;hb=45accc2589d257988a2f9481eb1702e50d1fbc23;hp=a4b3e3960aec19ab46735e4d6bd9b977549211ee;hpb=f27f1fcc5bffc0696f694e962eb40dbb0c554855;p=deb%2Fpackages.git diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl index a4b3e39..254f0b6 100755 --- 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; @@ -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)."
" - if $debug_allowed; + if DEBUG; my $trailer = Packages::HTML::trailer( $ROOT ); $trailer =~ s/LAST_MODIFIED_DATE/gmtime()/e; #FIXME