--- trunk/WebPac.pm	2003/09/03 23:07:21	124
+++ trunk/WebPac.pm	2003/11/29 19:11:23	190
@@ -12,7 +12,7 @@
 use Text::Unaccent;
 
 use lib '..';
-use index_DBI;
+use index_DBI_cache;
 use back2html;
 
 
@@ -27,7 +27,12 @@
 my $MAX_HITS = $cfg_global->val('webpac', 'max_hits') || 0;
 my $ON_PAGE =$cfg_global->val('webpac', 'on_page') || 10;
 my $MIN_WILDCARD =$cfg_global->val('webpac', 'min_wildcard') || 1;
+my $TEMPLATE =$cfg_global->val('webpac', 'template');
+my $UNAC_FILTER =$cfg_global->val('global', 'unac_filter');
 
+if ($UNAC_FILTER) {
+	require $UNAC_FILTER;
+}
 
 Text::Iconv->raise_error(0);     # Conversion errors raise exceptions
 
@@ -49,6 +54,19 @@
 	$self->header_props(-charset=>$CHARSET);
 }
 
+sub in_template {
+	my $html = shift || "This page is left unintentionally blank";
+	return $html if (! defined($TEMPLATE));
+	if (open(T, $TEMPLATE)) {
+		my $template_html = join("\n",<T>);
+		close(T);
+		$template_html =~ s/##webpac##/$html/gsi;
+		return $template_html;
+	} else {
+		return "Can't read template '$TEMPLATE'";
+	}
+}
+
 sub show_search_form {
 	my $self = shift;
 
@@ -60,8 +78,8 @@
 
 	my $fif = new HTML::FillInForm;
 
-	return $fif->fill(scalarref => \$html, fobject => $q,
-		target => 'search');
+	return in_template($fif->fill(scalarref => \$html, fobject => $q,
+		target => 'search'));
 }
  
 sub show_results_list {
@@ -79,8 +97,10 @@
 	my $full = $q->param('full');
 
 	my @persist_vars = ( 'rm' ); 
+	my @url_params = ( 'rm=results', 'show_full=1', 'last_PAGER_offset='.$q->param('PAGER_offset') || 0 );
 
-	for(my $i = 1; $i <=30; $i++) {
+	# support parametars "f" and "v" for start
+	for(my $i = ""; $i <=30; $i++) {
 
 		return show_index($self, $i) if ($q->param("f".$i."_index"));
 
@@ -89,10 +109,21 @@
 
 		push @persist_vars, "f$i";
 		push @persist_vars, "v$i";
+		push @persist_vars, "e$i" if ($q->param("e$i"));
+
+		push @url_params,"f$i=".$q->url_param("f$i");
+		foreach my $v ($q->url_param("v$i")) {
+			push @url_params,"v$i=$v";
+		}
+		push @url_params,"e$i=".$q->url_param("e$i");
+
+		my $wc="*";	# swish wildcard
+		$wc="" if ($i eq "");	# don't apply wildcard on field 0
 
 		# re-write query from +/- to and/and not
 		my @param_vals = $q->param("v$i");
 		my @swish_q;
+		my ($pre,$post,$exact) = ('','','');
 		while (my $search = shift @param_vals) {
 			my $s;
 			# remove accents
@@ -103,29 +134,44 @@
 			$search =~ s/^\s+//;
 			$search =~ s/\s+$//;
 
+			# filed e[nr] is exact match bitmask
+			# 1 = beginning, 2=end, 3=both
+			$pre = '"xxbxx ' if ($q->param("e$i") & 1);
+			$post = ' xxexx"' if ($q->param("e$i") & 2);
+			# add qotes on other side
+			if ($q->param("e$i")) {
+				$pre = '"' if (! $pre);
+				$post = '"' if (! $post);
+				# what about wildcards?
+				$wc = '';
+				$wc = '*' if ($q->param("e$i") & 4);
+				$exact = '_exact';
+			}
+
 			foreach (split(/\s+/,$search)) {
 				if (m/^([+-])(\S+)/) {
 					$s.= ($s) ? "and " : "";
 					$s.="not " if ($1 eq "-");
-					$s.="$2* ";
+					$s.=$2.$wc." ";
 				} elsif (m/^\s*(and|or|not)\s*$/i) {
-					$s.="$_ ";
+					$s.=$_." ";
 				# don't add * to words with less than x chars
 				} elsif (length($_) <= $MIN_WILDCARD) {
-					$s.="$_ ";
+					$s.=$_." ";
 				} else {
-					$s.="$_* ";
+					$s.=$_.$wc." ";
 				}
 			}
 			$s =~ s/\*+/*/g;
+			$s = $pre.$s.$post if ($q->param("e$i"));
 			push @swish_q,$s;
 		}
 		# FIXME default operator for multi-value fields is or. There is
 		# no way to change it, except here for now. Is there need?
-		push @s_arr, $q->param("f$i")."_swish=(".join(" or ",@swish_q).")";
+		push @s_arr, $q->param("f$i")."_swish".$exact."=(".join(" or ",@swish_q).")";
 	}
 
-	my $tmpl = $self->load_tmpl('results.html');
+	my $tmpl = $self->load_tmpl('results.html', global_vars => 1);
 
 	sub esc_html {
 		my $html = shift;
@@ -162,6 +208,9 @@
 		$sw_q .= join("\" or swishdocpath=\"",@path_arr);
 		$sw_q .= "\")";
 		$tmpl->param('full',1);	# show full records
+	} elsif ($q->param('show_full')) {
+		# just show full path, no path defined
+		$tmpl->param('full',1);
 	} else {
 		$tmpl->param('full',0);
 	}
@@ -174,6 +223,8 @@
 	$tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
 	$tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);
 
+	$tmpl->param('url_params',"?".join("&",@url_params));
+
 	# create a Pager object
 	my $pager = HTML::Pager->new(
 		# required parameters
@@ -208,7 +259,7 @@
 
 	my $html = $pager->output;
 
-	return $html;
+	return in_template($html);
 }
  
 sub show_index {
@@ -229,7 +280,7 @@
 		$cfg_global->val('global', 'dbi_passwd') || ''
 	);
 
-	my $total = $index->check($field);
+	my $total = $index->count($field,$limit);
 	if (! $total) {
 		my $tmpl = $self->load_tmpl('no_index.html');
 		$tmpl->param('field',$field);
@@ -252,7 +303,7 @@
 		get_data_callback => sub {
 			my ($offset, $rows) = @_;
 
-			my @result = $index->fetch($field,'item',$limit, $offset, $rows);
+			my @result = $index->fetch($field,$limit, $offset, $rows);
 			return \@result;
 		},
 		rows => $total,
@@ -266,7 +317,7 @@
 		template => $tmpl,
 	);
 
-	return $pager->output;
+	return in_template($pager->output);
 }
 
 1;