X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=cgi-bin%2Fdispatcher.pl;h=11a1d590a97f3e33c838436550780562d7aa00d2;hp=0de4f1cb0bd177df4911a6da228ad8a3ba07c9d8;hb=24cd19ddaa3a525f82bf389a3f004744a32a0916;hpb=1d735d4df7e110481faa67897ba4c35936998fc0

diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl
index 0de4f1c..11a1d59 100755
--- a/cgi-bin/dispatcher.pl
+++ b/cgi-bin/dispatcher.pl
@@ -13,28 +13,43 @@ use warnings;
 use lib '../lib';
 use CGI;
 use POSIX;
+use File::Basename;
 use URI::Escape;
 use HTML::Entities;
+use Template;
 use DB_File;
-use Benchmark;
+use Benchmark ':hireswallclock';
+use I18N::AcceptLanguage;
+use Locale::gettext;
 
 use Deb::Versions;
-use Packages::Config qw( $DBDIR $ROOT $SEARCH_CGI $SEARCH_PAGE
-			 @SUITES @SECTIONS @ARCHIVES @ARCHITECTURES );
-use Packages::CGI;
+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::DB;
 use Packages::Search qw( :all );
-use Packages::HTML ();
+use Packages::Template ();
 use Packages::Sections;
+use Packages::I18N::Locale;
 
 use Packages::DoSearch;
+use Packages::DoSearchContents;
 use Packages::DoShow;
+use Packages::DoIndex;
+use Packages::DoNewPkg;
 use Packages::DoDownload;
 use Packages::DoFilelist;
 
 &Packages::CGI::reset;
+$Packages::Search::too_many_hits = 0;
 
+# clean up env
 $ENV{PATH} = "/bin:/usr/bin";
+delete $ENV{'LANGUAGE'};
+delete $ENV{'LANG'};
+delete $ENV{'LC_ALL'};
+delete $ENV{'LC_MESSAGES'};
 
 # Read in all the variables set by the form
 my $input;
@@ -43,40 +58,60 @@ 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;
-# 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;
 
-&Packages::Config::init( '../' );
+my $homedir = dirname($ENV{SCRIPT_FILENAME}).'/../';
+&Packages::Config::init( $homedir );
 &Packages::DB::init();
 
+my $acc = I18N::AcceptLanguage->new();
+my $http_lang = $acc->accepts( $input->http("Accept-Language"),
+			       \@LANGUAGES ) || 'en';
+debug( "LANGUAGES=@LANGUAGES header=".
+       ($input->http("Accept-Language")||'').
+       " http_lang=$http_lang", 2 ) if DEBUG;
+bindtextdomain ( 'pdo', $LOCALES );
+textdomain( 'pdo' );
+
 my $what_to_do = 'show';
 my $source = 0;
-if (my $path = $input->path_info()) {
+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] eq 'search') {
-	shift @components;
-	$what_to_do = 'search';
+    push @components, 'index' if @components && $path =~ m,/$,;
+
+    my %LANGUAGES = map { $_ => 1 } @LANGUAGES;
+    if (@components > 0 and $LANGUAGES{$components[0]}) {
+	$input->param( 'lang', shift(@components) );
     }
-    if ($components[0] eq 'source') {
+    if (@components > 0 and $components[0] eq 'source') {
 	shift @components;
 	$input->param( 'source', 1 );
     }
-    if (@components == 0) {
-	# we just hope we get the information through our parameters...
+    if (@components > 0 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;
+    } elsif (@components == 0) {
+	fatal_error( _g( "We're supposed to display the homepage here, instead of getting dispatch.pl" ) );
     } elsif (@components == 1) {
 	$what_to_do = 'search';
     } else {
 
 	for ($components[-1]) {
-	    /^(changelog|copyright|download|filelist)$/ && do {
+	    /^(index|allpackages|newpkg|changelog|copyright|download|filelist)$/ && do {
 		pop @components;
 		$what_to_do = $1;
 		last;
@@ -84,48 +119,56 @@ if (my $path = $input->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 %PRIORITIES = map { $_ => 1 } @PRIORITIES;
 	my %params_set;
 	sub set_param_once {
 	    my ($cgi, $params_set, $key, $val) = @_;
+	    debug("set_param_once key=$key val=$val",4) if DEBUG;
 	    if ($params_set->{$key}++) {
-		fatal_error( "$key set more than once in path" );
+		fatal_error( sprintf( _g( "%s set more than once in path" ), $key ) );
 	    } else {
 		$cgi->param( $key, $val );
 	    }
 	}
 
-	my @tmp;
-	foreach (@components) {
-	    if ($SUITES{$_}) {
+	my (@pkg, $need_pkg);
+	foreach (reverse @components) {
+	    $need_pkg = !@pkg
+		&& ($what_to_do !~ /^(index|allpackages|newpkg)$/);
+	    debug("need_pkg=$need_pkg component=$_",4) if DEBUG;
+	    if (!$need_pkg && $SUITES{$_}) {
 		set_param_once( $input, \%params_set, 'suite', $_);
-#possible conflicts with package names
-#	    } elsif (my $s = $SUITES_ALIAS{$_}) {
-#		set_param_once( $input, \%params_set, 'suite', $s);
-	    } elsif ($SECTIONS{$_}) {
+	    } elsif (!$need_pkg && (my $s = $SUITES_ALIAS{$_})) {
+		set_param_once( $input, \%params_set, 'suite', $s);
+	    } elsif (!$need_pkg && $SECTIONS{$_}) {
 		set_param_once( $input, \%params_set, 'section', $_);
-	    } elsif ($ARCHIVES{$_}) {
+	    } elsif (!$need_pkg && $ARCHIVES{$_}) {
 		set_param_once( $input, \%params_set, 'archive', $_);
-	    } elsif ($ARCHITECTURES{$_}) {
-		set_param_once( $input, \%params_set, 'arch', $_);
-	    } elsif ($sections_descs{$_}) {
+	    } elsif (!$need_pkg && $sections_descs{$_}) {
 		set_param_once( $input, \%params_set, 'subsection', $_);
-	    } elsif ($_ eq 'source') {
+	    } elsif (!$need_pkg && ($_ eq 'non-us')) { # non-US hack
+		set_param_once( $input, \%params_set, 'subsection', 'non-US');
+	    } elsif (!$need_pkg && ($_ eq 'source')) {
 		set_param_once( $input, \%params_set, 'source', 1);
+	    } elsif ($ARCHITECTURES{$_}) {
+		set_param_once( $input, \%params_set, 'arch', $_);
+	    } elsif ($PRIORITIES{$_}) {
+		set_param_once( $input, \%params_set, 'priority', $_);
 	    } else {
-		push @tmp, $_;
+		push @pkg, $_;
 	    }
 	}
-	@components = @tmp;
+	@components = @pkg;
 
 	if (@components > 1) {
-	    fatal_error( "two or more packages specified (@components)" );
+	    fatal_error( sprintf( _g( "two or more packages specified (%s)" ), "@components" ) );
 	}
     } # else if (@components == 1)
     
@@ -138,22 +181,26 @@ if (my $path = $input->path_info()) {
 my ( $pkg, @suites, @sections, @subsections, @archives, @archs );
 
 my %params_def = ( keywords => { default => undef,
-				 match => '^\s*([-+\@\s\w\/.:]+)\s*$',
+				 array => '\s+',
+				 match => '^([-+\@\w\/.:]+)$',
 			     },
 		   package => { default => undef,
 				match => '^([\w.+-]+)$',
 				var => \$pkg },
-		   suite => { default => 'all', match => '^([\w-]+)$',
+		   suite => { default => 'default', match => '^([\w-]+)$',
 			      array => ',', var => \@suites,
-			      replace => { all => \@SUITES } },
+			      replace => { all => \@SUITES,
+					   default => \@SUITES } },
 		   archive => { default => ($what_to_do eq 'search') ?
 				    'all' : 'default',
 				    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+)$',  },
+		   debug => { default => 0, match => '^(\d+)$',  },
 		   searchon => { default => 'names', match => '^(\w+)$', },
 		   section => { default => 'all', match => '^([\w-]+)$',
 				alias => 'release', array => ',',
@@ -162,12 +209,31 @@ my %params_def = ( keywords => { default => undef,
 		   subsection => { default => 'default', match => '^([\w-]+)$',
 				   array => ',', var => \@subsections,
 				   replace => { default => [] } },
-		   arch => { default => 'any', match => '^(\w+)$',
+		   priority => { default => 'default', match => '^([\w-]+)$',
+				 array => ',',
+				 replace => { default => [] } },
+		   arch => { default => 'any', match => '^([\w-]+)$',
 			     array => ',', var => \@archs, replace =>
 			     { any => \@ARCHITECTURES } },
+		   format => { default => 'html', match => '^([\w.]+)$',  },
+		   mode => { default => undef, match => '^(\w+)$',  },
+		   sort_by => { default => 'file', match => '^(\w+)$', },
 		   );
 my %opts;
-my %params = Packages::Search::parse_params( $input, \%params_def, \%opts );
+my %params = Packages::CGI::parse_params( $input, \%params_def, \%opts );
+Packages::CGI::init_url( $input, \%params, \%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" ) if DEBUG;
+	    setlocale( LC_ALL, get_locale() )
+		or do {
+		    debug( "couldn't set default locale either" ) if DEBUG;
+		    setlocale( LC_ALL, "C" );
+		};
+	};
+debug( "locale=$locale charset=$charset", 2 ) if DEBUG;
 
 $opts{h_suites} = { map { $_ => 1 } @suites };
 $opts{h_sections} = { map { $_ => 1 } @sections };
@@ -182,56 +248,56 @@ if ((($opts{searchon} eq 'names') && $opts{source}) ||
 } else {
     $opts{searchon_form} = $opts{searchon};
 }
+if ($opts{searchon} eq 'contents' or $opts{searchon} eq 'filenames') {
+    $what_to_do = 'search_contents';
+}
 
 my $pet1 = new Benchmark;
 my $petd = timediff($pet1, $pet0);
-debug( "Parameter evaluation took ".timestr($petd) );
+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 } : {} ) );
 
-print $input->header( -charset => 'utf-8' );
+unless (-e "$TEMPLATEDIR/$opts{format}/${what_to_do}.tmpl") {
+    fatal_error( "requested format not available for this document",
+		 "405 requested format not available");
+}
 
-my (%html_header, $menu, $page_content);
+my (%html_header, %page_content);
 unless (@Packages::CGI::fatal_errors) {
     no strict 'refs';
     &{"do_$what_to_do"}( \%params, \%opts, \%html_header,
-			 \$menu, \$page_content );
-} else {
-    %html_header = ( title => 'Error',
-		     lang => 'en',
-		     print_title => 1,
-		     print_search_field => 'packages',
-		     search_field_values => { 
-			 keywords => 'search for a package',
-			 searchon => 'default',
-			 arch => 'any',
-			 suite => 'all',
-			 section => 'all',
-			 exact => 1,
-			 debug => $debug,
-		     },
-		     );
+			 \%page_content );
 }
 
-print Packages::HTML::header( %html_header );
+$page_content{opts} = \%opts;
+$page_content{params} = \%params;
 
-print $menu||'';
-print_errors();
-print_hints();
-print_msgs();
-print_debug();
-print_notes();
+$page_content{make_search_url} = sub { return &Packages::CGI::make_search_url(@_) };
+$page_content{make_url} = sub { return &Packages::CGI::make_url(@_) };
+# needed to work around the limitations of the the FILTER syntax
+$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]) };
+$page_content{string2id} = sub { return &Packages::CGI::string2id(@_) };
 
 unless (@Packages::CGI::fatal_errors) {
-    print $page_content;
+    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) {
+    print $input->header( -charset => $charset, -status => $Packages::CGI::http_code );
+} else {
+    # 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);
-print "Total page evaluation took ".timestr($tetd)."<br>"
-    if $debug_allowed;
-
-my $trailer = Packages::HTML::trailer( $ROOT );
-$trailer =~ s/LAST_MODIFIED_DATE/gmtime()/e; #FIXME
-print $trailer;
 
 # vim: ts=8 sw=4
-