$val = $override->{$p} if exists $override->{$p};
push @query_string, "$p=$val" if $val;
}
- push @path, $add_path if $add_path;
+ push @path, $add_path if $add_path and $add_path ne '/';
push @query_string, $add_query if $add_query;
my $path = join( '/', @path );
my $query_string = join( '&', @query_string );
+ $path .= '/' if $add_path and $add_path eq '/';
+ $path .= "?$query_string" if $query_string;
- return "$path?$query_string";
+ return $path;
}
sub make_search_url {
push @path, $Packages::Config::SEARCH_URL
if $Packages::Config::SEARCH_URL;
foreach my $p (qw(lang source suite archive section subsection
- exact mode searchon format debug)) {
+ arch exact mode searchon format debug)) {
my $val = $url_params{$p};
$val = $query_params{$p} if exists $query_params{$p};
$val = $override->{$p} if exists $override->{$p};
push @query_string, $add_query if $add_query;
my $path = join( '/', @path );
- my $query_string = join( '&', @query_string );
+ my $query_string = join( '&', @query_string );
return "$path?$query_string";
}