X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=WebPac.pm;h=4af84d866f66f6b6acfed2d41e7013c83ad246ff;hb=6a631ecdcd789163702283df7d9a58e6fd0a8869;hp=4375ea5c3fa376529a89452f1a969f3fd52e9133;hpb=5bd22bec41221e9d5f8b10c570f542898ff6d106;p=webpac

diff --git a/WebPac.pm b/WebPac.pm
index 4375ea5..4af84d8 100644
--- a/WebPac.pm
+++ b/WebPac.pm
@@ -12,7 +12,7 @@ use Text::Unaccent;
 use Data::Pageset;
 
 use lib '..';
-use index_DBI_cache;
+use index_DBI_filter;
 use back2html;
 
 
@@ -148,7 +148,7 @@ sub make_pager($$$) {
 
 
 	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 {
@@ -182,14 +182,17 @@ sub make_pager_vars {
 	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 '');
 			$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
@@ -224,6 +227,12 @@ sub show_results_list {
 
 	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
@@ -264,13 +273,15 @@ sub show_results_list {
 		push @url_params_persist,"f$i=".$q->url_param("f$i") if ($persist);
 
 		foreach my $v ($q->url_param("v$i")) {
+			# escape quotes so that phrase search work
+			$v =~ s/"/%22/g;
 			push @url_params,"v$i=$v";
 			push @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");
+#			push @url_params_persist,"e$i=".$q->url_param("e$i");
 		}
 
 		my $wc="*";	# swish wildcard
@@ -328,7 +339,7 @@ sub show_results_list {
 		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);
+	my $tmpl = $self->load_tmpl(url_ex($q,'results.html'), global_vars => 1, die_on_bad_params => 0);
 
 	$tmpl->param('url_params',"?".join("&",@url_params));
 
@@ -345,6 +356,13 @@ sub show_results_list {
 		push @persist_vars, "sort";
 	}
 
+	my $sortby = $q->param("sortby");
+	if ($sortby) {
+		$sort = $sortby;
+		push @persist_vars, "sortby";
+	}
+	$tmpl->param('url_params_paths',"?".join("&",@url_params).'&'.join("&",map { my $t = $_; $t =~ s/\#/%23/g; "path=$t"; } @path_arr));
+
 	# construct swish query
 	my $sw_q = join(" and ",@s_arr);
 	if (@path_arr && $q->param('show_full')) {
@@ -359,9 +377,11 @@ sub show_results_list {
 		$tmpl->param('full',0);
 	}
 
+	my $swish_msg = ' ';
+
 	# create new swish instance
 	my $swish = SWISH::API->new($INDEX);
-	$swish->AbortLastError 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;
@@ -369,12 +389,14 @@ sub show_results_list {
 	$search->SetSort($sort);
 
 	my $results = $search->Execute($sw_q);
-	$swish->AbortLastError 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);
@@ -438,6 +460,8 @@ sub show_index {
 	my $field = $q->param("f$i");
 	my $limit = $q->param("v$i");
 
+	my $filter = $q->param("filter");
+
 	my $html;
 
 	my $index = new index_DBI(
@@ -447,16 +471,16 @@ sub show_index {
 		$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);
@@ -482,7 +506,7 @@ sub show_index {
 	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);