X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=cgi-bin%2Fdispatcher.pl;h=4b413d71d99fb4bd85ce45e67728aa230f4acb8d;hb=da0b1ee79860ccd17033f11da212178d51ce9f47;hp=db9d155356e17ab9c761412d34e89b2a8c1d36c1;hpb=aed456717ac398a96918c7af8770c2733f1942d1;p=deb%2Fpackages.git diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl index db9d155..4b413d7 100755 --- a/cgi-bin/dispatcher.pl +++ b/cgi-bin/dispatcher.pl @@ -26,7 +26,7 @@ use Deb::Versions; use Packages::Config qw( $DBDIR $ROOT $TEMPLATEDIR $CACHEDIR @SUITES @SECTIONS @ARCHIVES @ARCHITECTURES @PRIORITIES @LANGUAGES $LOCALES ); -use Packages::CGI qw( :DEFAULT get_all_messages ); +use Packages::CGI qw( :DEFAULT error get_all_messages ); use Packages::DB; use Packages::Search qw( :all ); use Packages::Template (); @@ -83,6 +83,32 @@ debug( "LANGUAGES=@LANGUAGES header=". bindtextdomain ( 'pdo', $LOCALES ); textdomain( 'pdo' ); +# backwards compatibility stuff +debug( "SCRIPT_URL=$ENV{SCRIPT_URL} SCRIPT_URI=$ENV{SCRIPT_URI}" ) if DEBUG; + +if ($ENV{SCRIPT_URL} =~ m|^/cgi-bin/search_|) { + error( "You reached this site over an old URL. ". + "Depending on the exact parameters your search might work or not." ); + # contents search changed a lot + if ($ENV{SCRIPT_URL} =~ m|^/cgi-bin/search_contents|) { + $input->param('keywords',$input->param('word')) if $input->param('word'); + $input->param('searchon','contents'); + for ($input->param('searchmode')) { + /^searchfiles/ && do { + $input->param('mode','filename'); + last; + }; + /^filelist/ && do { + $ENV{PATH_INFO} = '/'.join('/',($input->param('version')||'stable', + $input->param('keywords'), + $input->param('arch')||'i386', + 'filelist' )); + $input->delete('searchon','version','keywords','arch'); + last; + }; + } + } +} if ($ENV{is_reportbug}) { $input->param('exact', 1); debug( "reportbug detected, set paramater exact to '1'" ) if DEBUG; @@ -93,6 +119,8 @@ my $source = 0; if (my $path = $input->path_info() || $input->param('PATH_INFO')) { my @components = grep { $_ } map { lc $_ } split /\/+/, $path; + debug( "PATH_INFO=$path components=@components", 3) if DEBUG; + push @components, 'index' if @components && $path =~ m,/$,; my %LANGUAGES = map { $_ => 1 } @LANGUAGES; @@ -295,7 +323,7 @@ unless (@Packages::CGI::fatal_errors) { my $tet1 = new Benchmark; my $tetd = timediff($tet1, $tet0); print $template->trailer( undef, undef, undef, $tetd ); -} elsif ($Packages::CGI::http_code) { +} elsif ($Packages::CGI::http_code && $Packages::CGI::http_code !~ /^2\d\d/) { print $input->header( -charset => $charset, -status => $Packages::CGI::http_code ); } else { # We currently have only an error page in html