63 |
|
|
64 |
return $tpl if (! $base_path); |
return $tpl if (! $base_path); |
65 |
|
|
66 |
|
#warn "base_path: $base_path, p: $p, path: $path, tpl: $tpl\n"; |
67 |
|
|
68 |
|
$p =~ s#/[^/]*$##; |
69 |
|
|
70 |
# strip everything to and including base path, leaving only |
# strip everything to and including base path, leaving only |
71 |
# additional (virtual) path |
# additional (virtual) path |
72 |
if ($base_path eq "/") { |
if ($base_path eq "/") { |
251 |
my $full = $q->param('full'); |
my $full = $q->param('full'); |
252 |
|
|
253 |
my @persist_vars = ( 'rm', 'persist_search' ); |
my @persist_vars = ( 'rm', 'persist_search' ); |
254 |
my @url_params = ( 'rm=results', 'show_full=1', 'last_PAGER_offset='.($q->param('PAGER_offset') || 0) ); |
my $url_params = { |
255 |
|
'rm' => 'results', |
256 |
|
'show_full' => 1, |
257 |
|
'last_PAGER_offset' => ($q->param('PAGER_offset') || 0), |
258 |
|
}; |
259 |
|
|
260 |
my @persist_search_vars; |
my @persist_search_vars; |
261 |
my @url_params_persist; |
my $url_params_persist = {}; |
262 |
if ($q->param("persist_search")) { |
if ($q->param("persist_search")) { |
263 |
@persist_search_vars = split(/\s*,\s*/, $q->param("persist_search")); |
@persist_search_vars = split(/\s*,\s*/, $q->param("persist_search")); |
264 |
push @url_params_persist, "persist_search=".$q->url_param("persist_search"); |
$url_params_persist->{'persist_search'} = $q->url_param("persist_search"); |
265 |
push @url_params,"persist_search=".$q->url_param("persist_search"); |
$url_params->{'persist_search'} = $q->url_param("persist_search"); |
266 |
} |
} |
267 |
|
|
268 |
# support parametars "f" and "v" for start |
# support parametars "f" and "v" for start |
283 |
|
|
284 |
# create url parametars (and persistent ones) |
# create url parametars (and persistent ones) |
285 |
|
|
286 |
push @url_params,"f$i=".$q->url_param("f$i"); |
$url_params->{"f$i"} = $q->url_param("f$i"); |
287 |
push @url_params_persist,"f$i=".$q->url_param("f$i") if ($persist); |
$url_params_persist->{"f$i"} = $q->url_param("f$i") if ($persist); |
288 |
|
|
289 |
|
my @v; |
290 |
|
|
291 |
foreach my $v ($q->url_param("v$i")) { |
foreach my $v ($q->url_param("v$i")) { |
292 |
# escape quotes so that phrase search work |
# escape quotes so that phrase search work |
293 |
$v =~ s/"/%22/g; |
$v =~ s/"/%22/g; |
294 |
push @url_params,"v$i=$v"; |
push @v, $v; |
|
push @url_params_persist,"v$i=$v" if ($persist); |
|
295 |
} |
} |
296 |
|
$url_params->{"v$i"} = \@v; |
297 |
|
$url_params_persist->{"v$i"} = \@v if ($persist); |
298 |
|
|
299 |
if ($q->param("e$i")) { |
if ($q->param("e$i")) { |
300 |
push @url_params,"e$i=".$q->url_param("e$i"); |
$url_params->{"e$i"} = $q->url_param("e$i"); |
301 |
# push @url_params_persist,"e$i=".$q->url_param("e$i"); |
# $url_params_persist->{"e$i"} = $q->url_param("e$i"); |
302 |
} |
} |
303 |
|
|
304 |
my $wc="*"; # swish wildcard |
my $wc="*"; # swish wildcard |
400 |
if ($filter) { |
if ($filter) { |
401 |
$sw_q .= " and (swishdocpath=\"$filter\")" unless (@path_arr); |
$sw_q .= " and (swishdocpath=\"$filter\")" unless (@path_arr); |
402 |
push @persist_vars, "filter"; |
push @persist_vars, "filter"; |
403 |
push @url_params, "filter=$filter"; |
$url_params->{'filter'} = $filter; |
404 |
push @url_params_persist, "filter=$filter"; |
$url_params_persist->{'filter'} = $filter; |
405 |
} |
} |
406 |
|
|
407 |
my $swish_msg = ' '; |
my $swish_msg = ' '; |
429 |
$tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0); |
$tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0); |
430 |
|
|
431 |
# URL parametars for search results |
# URL parametars for search results |
432 |
$tmpl->param('url_params',"?".join("&",@url_params)); |
sub cook_url_params { |
433 |
$tmpl->param('url_params_paths',"?".join("&",@url_params).'&'.join("&",map { my $t = $_; $t =~ s/\#/%23/g; "path=$t"; } @path_arr)); |
my $hash = shift || return; |
434 |
|
return join("&", map { |
435 |
|
my $var = $_; |
436 |
|
if (ref($hash->{$var}) eq 'ARRAY') { |
437 |
|
join('&', |
438 |
|
map { $var.'='.$_ } @{$hash->{$var}} |
439 |
|
); |
440 |
|
} else { |
441 |
|
$var."=".$hash->{$var}; |
442 |
|
} |
443 |
|
} keys %{$hash}); |
444 |
|
} |
445 |
|
|
446 |
|
$tmpl->param('url_params',"?".cook_url_params($url_params)); |
447 |
|
$tmpl->param('url_params_paths',"?".cook_url_params($url_params).'&'.join("&",map { my $t = $_; $t =~ s/\#/%23/g; "path=$t"; } @path_arr)); |
448 |
|
|
449 |
|
|
450 |
|
|
481 |
rank => $result->Property('swishrank') |
rank => $result->Property('swishrank') |
482 |
}; |
}; |
483 |
|
|
484 |
$r->{html} = back2html($from_utf8->convert($result->Property('html')), join("&",@url_params_persist)) if ($q->param('show_full')); |
#$r->{html} = back2html($from_utf8->convert($result->Property('html')), cook_url_params($url_params_persist)) if ($q->param('show_full')); |
485 |
|
$r->{html} = back2html($from_utf8->convert($result->Property('html')), $filter ? 'filter='.$filter : '') if ($q->param('show_full')); |
486 |
|
|
487 |
push @pager_data_list, $r; |
push @pager_data_list, $r; |
488 |
} |
} |