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;
shift @components;
$what_to_do = 'search';
# Done
- fatal_error( _( "search doesn't take any more path elements" ) )
+ fatal_error( _g( "search doesn't take any more path elements" ) )
if @components > 0;
} 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 {
sub set_param_once {
my ($cgi, $params_set, $key, $val) = @_;
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 );
}
@components = @tmp;
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 $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) );
+debug( "Parameter evaluation took ".timestr($petd) ) if DEBUG;
print $input->header( -charset => $charset );
&{"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_errors();
print_hints();
print_msgs();
-print_debug();
+print_debug() if DEBUG;
print_notes();
unless (@Packages::CGI::fatal_errors) {