X-Git-Url: https://git.deb.at/?p=deb%2Fpackages.git;a=blobdiff_plain;f=cgi-bin%2Fdispatcher.pl;h=72117d6b18e40c5a4c4c52d6ceb1230c9264c8e1;hp=99c547998e54ac98405383c8ec4190e62665fd63;hb=33428890dd0ed9cf414c65b0b091b7fe064ecba2;hpb=e23d2d2080a904ddd6d989a878f3c9b164f0a075
diff --git a/cgi-bin/dispatcher.pl b/cgi-bin/dispatcher.pl
index 99c5479..72117d6 100755
--- a/cgi-bin/dispatcher.pl
+++ b/cgi-bin/dispatcher.pl
@@ -13,19 +13,23 @@ 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 ':hireswallclock';
use I18N::AcceptLanguage;
use Locale::gettext;
use Deb::Versions;
-use Packages::Config qw( $DBDIR $ROOT @SUITES @SECTIONS @ARCHIVES @ARCHITECTURES @LANGUAGES $LOCALES );
-use Packages::CGI;
+use Packages::Config qw( $DBDIR $ROOT $TEMPLATEDIR $CACHEDIR
+ @SUITES @SECTIONS @ARCHIVES @ARCHITECTURES @PRIORITIES
+ @LANGUAGES @DDTP_LANGUAGES $LOCALES );
+use Packages::CGI qw( :DEFAULT error get_all_messages );
use Packages::DB;
use Packages::Search qw( :all );
-use Packages::HTML ();
+use Packages::Template ();
use Packages::Sections;
use Packages::I18N::Locale;
@@ -33,10 +37,12 @@ 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";
@@ -52,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;
@@ -59,31 +70,70 @@ 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 %all_langs = map { $_ => 1 } (@LANGUAGES, @DDTP_LANGUAGES);
+my @all_langs = sort keys %all_langs;
my $http_lang = $acc->accepts( $input->http("Accept-Language"),
- \@LANGUAGES );
-debug( "LANGUAGES=@LANGUAGES header=".
- $input->http("Accept-Language").
- " http_lang=$http_lang", 2 );
+ \@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;
- push @components, 'index' if $path =~ m,/$,;
+ debug( "PATH_INFO=$path components=@components", 3) if DEBUG;
+
+ push @components, 'index' if @components && $path =~ m,/$,;
- debug( "components[0]=$components[0]", 2 ) if DEBUG and @components>0;
+ 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 );
}
- if (@components > 1 and $components[0] eq 'search') {
+ if (@components > 0 and $components[0] eq 'search') {
shift @components;
$what_to_do = 'search';
# Done
@@ -96,7 +146,7 @@ if (my $path = $input->path_info() || $input->param('PATH_INFO')) {
} else {
for ($components[-1]) {
- /^(index|changelog|copyright|download|filelist)$/ && do {
+ /^(index|allpackages|newpkg|changelog|copyright|download|filelist)$/ && do {
pop @components;
$what_to_do = $1;
last;
@@ -104,16 +154,18 @@ 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 {
my ($cgi, $params_set, $key, $val) = @_;
+ debug("set_param_once key=$key val=$val",4) if DEBUG;
if ($params_set->{$key}++) {
fatal_error( sprintf( _g( "%s set more than once in path" ), $key ) );
} else {
@@ -121,28 +173,35 @@ 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)$/);
+ 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', $_)
+ unless $_ eq 'any';
+ } elsif ($PRIORITIES{$_}) {
+ set_param_once( $input, \%params_set, 'priority', $_);
} else {
- push @tmp, $_;
+ push @pkg, $_;
}
}
- @components = @tmp;
+ @components = @pkg;
if (@components > 1) {
fatal_error( sprintf( _g( "two or more packages specified (%s)" ), "@components" ) );
@@ -158,23 +217,26 @@ if (my $path = $input->path_info() || $input->param('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 => ',',
@@ -183,12 +245,19 @@ my %params_def = ( keywords => { default => undef,
subsection => { default => 'default', match => '^([\w-]+)$',
array => ',', var => \@subsections,
replace => { default => [] } },
+ 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});
@@ -223,51 +292,48 @@ my $pet1 = new Benchmark;
my $petd = timediff($pet1, $pet0);
debug( "Parameter evaluation took ".timestr($petd) ) if DEBUG;
-my (%html_header, $menu, $page_content);
+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';
&{"do_$what_to_do"}( \%params, \%opts, \%html_header,
- \$menu, \$page_content );
-} else {
- %html_header = ( title => _g('Error'),
- lang => $opts{lang},
- print_title => 1,
- print_search_field => 'packages',
- search_field_values => {
- keywords => _g('search for a package'),
- searchon => 'default',
- arch => 'any',
- suite => 'all',
- section => 'all',
- exact => 1,
- debug => $debug,
- },
- );
+ \%page_content );
}
-print $input->header( -charset => $charset );
-
-print Packages::HTML::header( %html_header );
+$page_content{opts} = \%opts;
+$page_content{params} = \%params;
-print $menu||'';
-print_errors();
-print_hints();
-print_msgs();
-print_debug() if 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 ''.Dumper(\%ENV, \%html_header, \%page_content, get_all_messages()).'
';
+ 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 {
+ # 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)."
"
- if DEBUG;
-
-my $trailer = Packages::HTML::trailer( $ROOT );
-$trailer =~ s/LAST_MODIFIED_DATE/gmtime()/e; #FIXME
-print $trailer;
# vim: ts=8 sw=4
-