use Config::IniFiles;
use Text::Unaccent;
use Data::Pageset;
+use POSIX qw(locale_h);
use lib '..';
-use index_DBI_tag;
+use index_DBI_filter;
use back2html;
my $BASE_PATH =$cfg_global->val('webpac', 'base_path');
# for pager
my $pages_per_set = $cfg_global->val('webpac', 'pages_per_set') || 10;
+my $locale = $cfg_global->val('locale') || 'hr_HR';
Text::Iconv->raise_error(0); # Conversion errors raise exceptions
my $from_utf8 = Text::Iconv->new('UTF8', $CHARSET);
+setlocale(LC_CTYPE, $locale);
+setlocale(LC_COLLATE, $locale);
+
if ($UNAC_FILTER) {
require $UNAC_FILTER;
} else {
return $tpl if (! $base_path);
+ #warn "base_path: $base_path, p: $p, path: $path, tpl: $tpl\n";
+
+ $p =~ s#/[^/]*$##;
+
# strip everything to and including base path, leaving only
# additional (virtual) path
if ($base_path eq "/") {
#
my ($pager_prev,$pager_next, $pager_jump) = ('','','');
- my $nav_fmt=qq{ <a href="%s">%s</a> };
+ sub url_with_params {
+ my ($q,$text) = @_;
+ my %param = $q->Vars;
+ my @p;
+ foreach my $p ( keys %param ) {
+ my $v = $param{$p};
+ next unless defined $v and length($v) > 0;
+ if ( $v =~ m{\0} ) {
+ push @p, $p . '=' . my_unac_string($CHARSET, $_)
+ foreach (split(/\0/, $v ));
+ } else {
+ push @p, $p . '=' . my_unac_string($CHARSET, $v);
+ }
+ }
+
+ return
+ qq{ <a href="}
+ . $q->url( -relative => 1 )
+ . '?'
+ . join(';', @p)
+ . qq{">$text</a> };
+ }
if ($pager->current_page() > $pager->first_page) {
$q->param('PAGER_offset', $pager->current_page - 1);
- $pager_prev .= sprintf($nav_fmt,$q->url(-relative=>1, -query=>1),'<<');
+ $pager_prev .= url_with_params( $q, '<<');
}
if ($pager->previous_set) {
$q->param('PAGER_offset', $pager->previous_set);
- $pager_prev .= sprintf($nav_fmt,$q->url(-relative=>1, -query=>1),'..');
+ $pager_prev .= url_with_params( $q,'..');
}
foreach my $p (@{$pager->pages_in_set()}) {
- next if ($p < 0);
+ next if ($p <= 0);
if($p == $pager->current_page()) {
$pager_jump .= "<b>$p</b> ";
} else {
$q->param('PAGER_offset', $p);
- $pager_jump .= sprintf($nav_fmt,$q->url(-relative=>1, -query=>1),$p);
+ $pager_jump .= url_with_params($q,$p);
}
}
if ($pager->next_set) {
$q->param('PAGER_offset', $pager->next_set);
- $pager_next .= sprintf($nav_fmt,$q->url(-relative=>1, -query=>1),'..');
+ $pager_next .= url_with_params($q,'..');
}
if ($pager->current_page() < $pager->last_page) {
$q->param('PAGER_offset', $pager->current_page + 1);
- $pager_next .= sprintf($nav_fmt,$q->url(-relative=>1, -query=>1),'>>');
+ $pager_next .= url_with_params($q,'>>');
}
$tmpl->param('PAGER_PREV', $pager_prev);
my $tmpl = shift @_;
my @persist_vars = @_;
my $hidden_vars = '';
+ my $hidden_search = '';
foreach my $v (@persist_vars) {
foreach my $val ($q->param($v)) {
next if (! $val || $val eq '');
+ $val =~ s/"/"/g;
$hidden_vars .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n";
+ $hidden_search .= '<input type="hidden" name="'.$v.'" value="'.$val.'"/>'."\n" if ($v ne "rm");
}
}
$tmpl->param('PAGER_HIDDEN', $hidden_vars);
+ $tmpl->param('SEARCH_HIDDEN', $hidden_search);
$tmpl->param('PAGER_JAVASCRIPT', qq#
<SCRIPT LANGUAGE="Javascript">
<!-- Begin
my $q = $self->query();
+ # submit was reset?
+ if ($q->param('reset')) {
+ $q->delete_all;
+ return $self->show_search_form();
+ }
+
# load template for this page
my @s_arr; # all queries are located here
my $full = $q->param('full');
my @persist_vars = ( 'rm', 'persist_search' );
- my @url_params = ( 'rm=results', 'show_full=1', 'last_PAGER_offset='.($q->param('PAGER_offset') || 0) );
+ my $url_params = {
+ 'rm' => 'results',
+ 'show_full' => 1,
+ 'last_PAGER_offset' => ($q->param('PAGER_offset') || 0),
+ };
my @persist_search_vars;
- my @url_params_persist;
+ my $url_params_persist = {};
if ($q->param("persist_search")) {
@persist_search_vars = split(/\s*,\s*/, $q->param("persist_search"));
- push @url_params_persist, "persist_search=".$q->url_param("persist_search");
- push @url_params,"persist_search=".$q->url_param("persist_search");
+ $url_params_persist->{'persist_search'} = $q->url_param("persist_search");
+ $url_params->{'persist_search'} = $q->url_param("persist_search");
}
# support parametars "f" and "v" for start
# create url parametars (and persistent ones)
- push @url_params,"f$i=".$q->url_param("f$i");
- push @url_params_persist,"f$i=".$q->url_param("f$i") if ($persist);
+ $url_params->{"f$i"} = $q->url_param("f$i");
+ $url_params_persist->{"f$i"} = $q->url_param("f$i") if ($persist);
+
+ my @v;
foreach my $v ($q->url_param("v$i")) {
- push @url_params,"v$i=$v";
- push @url_params_persist,"v$i=$v" if ($persist);
+ # escape quotes so that phrase search work
+ $v =~ s/"/%22/g;
+ push @v, $v;
}
+ $url_params->{"v$i"} = \@v;
+ $url_params_persist->{"v$i"} = \@v if ($persist);
if ($q->param("e$i")) {
- push @url_params,"e$i=".$q->url_param("e$i");
-# push @url_params_persist,"e$i=".$q->url_param("e$i");
+ $url_params->{"e$i"} = $q->url_param("e$i");
+# $url_params_persist->{"e$i"} = $q->url_param("e$i");
}
my $wc="*"; # swish wildcard
}
}
$s =~ s/\*+/*/g;
+ $s =~ s/[()]//g; # () are used in query language
$s = $pre.$s.$post if ($q->param("e$i"));
push @swish_q,$s;
}
push @s_arr, $q->param("f$i")."_swish".$exact."=(".join(" or ",@swish_q).")";
}
- my $tmpl = $self->load_tmpl(url_ex($q,'results.html'), global_vars => 1);
-
- $tmpl->param('url_params',"?".join("&",@url_params));
+ my $tmpl = $self->load_tmpl(url_ex($q,'results.html'), global_vars => 1, die_on_bad_params => 0);
sub esc_html {
my $html = shift;
push @persist_vars, "sort";
}
+ my $sortby = $q->param("sortby");
+ if ($sortby) {
+ $sort = $sortby;
+ push @persist_vars, "sortby";
+ }
+ # used to filter entries in index and swish
+ my $filter = $q->param("filter");
+
# construct swish query
my $sw_q = join(" and ",@s_arr);
if (@path_arr && $q->param('show_full')) {
- $sw_q .= "and (swishdocpath=\"";
+ $sw_q .= " and (swishdocpath=\"";
$sw_q .= join("\" or swishdocpath=\"",@path_arr);
$sw_q .= "\")";
$tmpl->param('full',1); # show full records
+# } elsif (@path_arr && $#path_arr == 0) {
+# # I will assume that it's a filter since there isn't show_full
+# $filter = shift @path_arr;
} elsif ($q->param('show_full')) {
# just show full path, no path defined
$tmpl->param('full',1);
$tmpl->param('full',0);
}
+ if ($filter) {
+ $sw_q .= " and (swishdocpath=\"$filter\")" unless (@path_arr);
+ push @persist_vars, "filter";
+ $url_params->{'filter'} = $filter;
+ $url_params_persist->{'filter'} = $filter;
+ }
+
+ my $swish_msg = ' ';
+
# create new swish instance
my $swish = SWISH::API->new($INDEX);
- die $swish->ErrorString.": ".$swish->LastErrorMsg if $swish->Error;
+ $swish_msg .= $swish->ErrorString." ".$swish->LastErrorMsg if $swish->Error;
# execute query and get number of results from SWISH-E
my $search = $swish->New_Search_Object;
$search->SetSort($sort);
my $results = $search->Execute($sw_q);
- die $swish->ErrorString.": ".$swish->LastErrorMsg if $swish->Error;
+ $swish_msg .= $swish->ErrorString." ".$swish->LastErrorMsg if $swish->Error;
my $hits = $results->Hits;
$tmpl->param('hits',$hits);
- $tmpl->param('search',$sw_q);
+ my $search_msg = $sw_q;
+ $search_msg .= '<em>'.$swish_msg.'</em>' if ($swish_msg);
+ $tmpl->param('search', $search_msg);
$tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
$tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);
+ # URL parametars for search results
+ sub cook_url_params {
+ my $hash = shift || return;
+ return join("&", map {
+ my $var = $_;
+ if (ref($hash->{$var}) eq 'ARRAY') {
+ join('&',
+ map { $var.'='.$_ } @{$hash->{$var}}
+ );
+ } else {
+ $var."=".$hash->{$var};
+ }
+ } keys %{$hash});
+ }
+
+ $tmpl->param('url_params',"?".cook_url_params($url_params));
+ $tmpl->param('url_params_paths',"?".cook_url_params($url_params).'&'.join("&",map { my $t = $_; $t =~ s/\#/%23/g; "path=$t"; } @path_arr));
+
+
+
#
# build pager
#
rank => $result->Property('swishrank')
};
- $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'));
+ $r->{html} = back2html($from_utf8->convert($result->Property('html')), $filter ? 'filter='.$filter : '') if ($q->param('show_full'));
push @pager_data_list, $r;
}
my $field = $q->param("f$i");
my $limit = $q->param("v$i");
+ my $filter = $q->param("filter");
+
my $html;
my $index = new index_DBI(
$cfg_global->val('global', 'dbi_passwd') || ''
);
- my $total = $index->count($field,$limit);
+ my $total = $index->count($field,$limit,$filter);
- if (! $total) {
+ if (! defined($total)) {
my $tmpl = $self->load_tmpl(url_ex($q,'no_index.html'));
$tmpl->param('field',$field);
$html = $tmpl->output;
return $html;
}
- my $tmpl = $self->load_tmpl(url_ex($q,'index_res.html'), global_vars => 1);
+ my $tmpl = $self->load_tmpl(url_ex($q,'index_res.html'), global_vars => 1, die_on_bad_params => 0);
$tmpl->param('field',$field);
$tmpl->param('limit',$limit);
$tmpl->param('total',$total);
+ $tmpl->param('filter',$filter);
# FIXME I should set offset and leave out limit from fetch!!
# if (! $q->param("PAGER_offset") {
make_pager($q, $tmpl, $pager);
make_pager_vars($q, $tmpl, @persist_vars);
- my @pager_data_list = $index->fetch($field,$limit, $pager->first - 1, $pager->entries_on_this_page);
+ my @pager_data_list = $index->fetch($field,$limit, $pager->first - 1, $pager->entries_on_this_page, $filter);
$tmpl->param('PAGER_DATA_LIST', \@pager_data_list);
return in_template($q,$tmpl->output);
projects / webpac / blobdiff