use Packages::DoSearch;
use Packages::DoSearchContents;
use Packages::DoShow;
+use Packages::DoIndex;
+use Packages::DoNewPkg;
use Packages::DoDownload;
use Packages::DoFilelist;
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;
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' );
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 @components && $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 );
shift @components;
$what_to_do = 'search';
# Done
- fatal_error( _( "search doesn't take any more path elements" ) )
- if @components > 0;
+ fatal_error( _g( "search doesn't take any more path elements" ) )
+ if @components;
} elsif (@components == 0) {
- fatal_error( _( "We're supposed to display the homepage here, instead of getting dispatch.pl" ) );
+ 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;
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( _( "%s set more than once in path" ), $key ) );
+ 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', $_);
} else {
- push @tmp, $_;
+ push @pkg, $_;
}
}
- @components = @tmp;
+ @components = @pkg;
if (@components > 1) {
- fatal_error( sprintf( _( "two or more packages specified (%s)" ), "@components" ) );
+ fatal_error( sprintf( _g( "two or more packages specified (%s)" ), "@components" ) );
}
} # else if (@components == 1)
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 => ',',
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});
setlocale ( LC_ALL, $locale )
- or do { debug( "couldn't set locale $locale, using default" );
+ 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" );
+ debug( "couldn't set default locale either" ) if DEBUG;
setlocale( LC_ALL, "C" );
};
};
-debug( "locale=$locale charset=$charset", 2 );
+debug( "locale=$locale charset=$charset", 2 ) if DEBUG;
$opts{h_suites} = { map { $_ => 1 } @suites };
$opts{h_sections} = { map { $_ => 1 } @sections };
my $pet1 = new Benchmark;
my $petd = timediff($pet1, $pet0);
-debug( "Parameter evaluation took ".timestr($petd) );
-
-print $input->header( -charset => $charset );
+debug( "Parameter evaluation took ".timestr($petd) ) if DEBUG;
my (%html_header, $menu, $page_content);
unless (@Packages::CGI::fatal_errors) {
&{"do_$what_to_do"}( \%params, \%opts, \%html_header,
\$menu, \$page_content );
} else {
- %html_header = ( title => _('Error'),
+ %html_header = ( title => _g('Error'),
lang => $opts{lang},
print_title => 1,
print_search_field => 'packages',
search_field_values => {
- keywords => _('search for a package'),
+ keywords => _g('search for a package'),
searchon => 'default',
arch => 'any',
suite => 'all',
);
}
+print $input->header( -charset => $charset );
+
print Packages::HTML::header( %html_header );
print $menu||'';
print_errors();
print_hints();
print_msgs();
-print_debug();
+print_debug() if DEBUG;
print_notes();
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
print $trailer;
# vim: ts=8 sw=4
projects / deb / packages.git / blobdiff