X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=cgi-bin%2Fdispatcher.pl;h=72117d6b18e40c5a4c4c52d6ceb1230c9264c8e1;hp=45d1b463154539b9c20dc63c71e3b5eb40285650;hb=33428890dd0ed9cf414c65b0b091b7fe064ecba2;hpb=2ec757bb58907b15c43548be5601d4f2b8c7caac

diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl
index 45d1b46..72117d6 100755
--- a/cgi-bin/dispatcher.pl
+++ b/cgi-bin/dispatcher.pl
@@ -25,8 +25,8 @@ use Locale::gettext;
 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 );
+			 @LANGUAGES @DDTP_LANGUAGES $LOCALES );
+use Packages::CGI qw( :DEFAULT error get_all_messages );
 use Packages::DB;
 use Packages::Search qw( :all );
 use Packages::Template ();
@@ -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;
@@ -70,19 +75,54 @@ my $homedir = dirname($ENV{SCRIPT_FILENAME}).'/../';
 &Packages::DB::init();
 
 my $acc = I18N::AcceptLanguage->new();
+my %all_langs = map { $_ => 1 } (@LANGUAGES, @DDTP_LANGUAGES);
+my @all_langs = sort keys %all_langs;
 my $http_lang = $acc->accepts( $input->http("Accept-Language"),
-			       \@LANGUAGES ) || 'en';
-debug( "LANGUAGES=@LANGUAGES header=".
+			       \@all_langs ) || 'en';
+debug( "LANGUAGES=@all_langs header=".
        ($input->http("Accept-Language")||'').
        " http_lang=$http_lang", 2 ) if DEBUG;
 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;
+}
+
 my $what_to_do = 'show';
 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;
@@ -114,13 +154,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 +193,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 +294,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';
@@ -269,22 +315,25 @@ $page_content{make_url} = sub { return &Packages::CGI::make_url(@_) };
 $page_content{html_encode} = sub { return HTML::Entities::encode_entities(@_,'<>&"') };
 $page_content{uri_escape} = sub { return URI::Escape::uri_escape(@_) };
 $page_content{quotemeta} = sub { return quotemeta($_[0]) };
-
-print $input->header( -charset => $charset );
-
-#use Data::Dumper;
-#print '<pre>'.Dumper(\%ENV, \%html_header, \%page_content, get_all_messages()).'</pre>';
+$page_content{string2id} = sub { return &Packages::CGI::string2id(@_) };
 
 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