X-Git-Url: https://git.deb.at/?a=blobdiff_plain;f=cgi-bin%2Fdispatcher.pl;h=22fc691c84dd33185ccb8bb69d5cacc805462aea;hb=a4c9c1c1debdde95b8e83e85ada074de0fc035d5;hp=a4b3e3960aec19ab46735e4d6bd9b977549211ee;hpb=f27f1fcc5bffc0696f694e962eb40dbb0c554855;p=deb%2Fpackages.git

diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl
index a4b3e39..22fc691 100755
--- a/cgi-bin/dispatcher.pl
+++ b/cgi-bin/dispatcher.pl
@@ -32,6 +32,8 @@ 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;
 
@@ -63,10 +65,10 @@ $Packages::CGI::debug = $debug;
 
 my $acc = I18N::AcceptLanguage->new();
 my $http_lang = $acc->accepts( $input->http("Accept-Language"),
-			       \@LANGUAGES );
+			       \@LANGUAGES ) || 'en';
 debug( "LANGUAGES=@LANGUAGES header=".
-       $input->http("Accept-Language").
-       " http_lang=$http_lang", 2 );
+       ($input->http("Accept-Language")||'').
+       " http_lang=$http_lang", 2 ) if DEBUG;
 bindtextdomain ( 'pdo', $LOCALES );
 textdomain( 'pdo' );
 
@@ -75,7 +77,12 @@ 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,/$,;
+
+    my %LANGUAGES = map { $_ => 1 } @LANGUAGES;
+    if (@components > 0 and $LANGUAGES{$components[0]}) {
+	$input->param( 'lang', shift(@components) );
+    }
     if (@components > 0 and $components[0] eq 'source') {
 	shift @components;
 	$input->param( 'source', 1 );
@@ -85,7 +92,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 +100,7 @@ if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
     } else {
 
 	for ($components[-1]) {
-	    /^(changelog|copyright|download|filelist)$/ && do {
+	    /^(index|allpackages|newpkg|changelog|copyright|download|filelist)$/ && do {
 		pop @components;
 		$what_to_do = $1;
 		last;
@@ -118,28 +125,29 @@ if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
 	    }
 	}
 
-	my @tmp;
-	foreach (@components) {
-	    if ($SUITES{$_}) {
+	my (@pkg, $need_pkg);
+	foreach (reverse @components) {
+	    $need_pkg = !@pkg
+		&& ($what_to_do !~ /^(index|allpackages|newpkg)$/);
+	    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 'source')) {
 		set_param_once( $input, \%params_set, 'source', 1);
+	    } elsif ($ARCHITECTURES{$_}) {
+		set_param_once( $input, \%params_set, 'arch', $_);
 	    } else {
-		push @tmp, $_;
+		push @pkg, $_;
 	    }
 	}
-	@components = @tmp;
+	@components = @pkg;
 
 	if (@components > 1) {
 	    fatal_error( sprintf( _g( "two or more packages specified (%s)" ), "@components" ) );
@@ -168,10 +176,11 @@ my %params_def = ( keywords => { default => undef,
 				    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 => ',',
@@ -183,9 +192,12 @@ my %params_def = ( keywords => { default => undef,
 		   arch => { default => 'any', match => '^([\w-]+)$',
 			     array => ',', var => \@archs, replace =>
 			     { any => \@ARCHITECTURES } },
+		   format => { default => 'html', match => '^(\w+)$',  },
+		   mode => { default => undef, 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});
@@ -220,8 +232,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 +254,8 @@ unless (@Packages::CGI::fatal_errors) {
 		     );
 }
 
+print $input->header( -charset => $charset );
+
 print Packages::HTML::header( %html_header );
 
 print $menu||'';
@@ -260,7 +272,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