--- trunk/WebPac.pm	2003/07/16 15:49:56	114
+++ trunk/WebPac.pm	2003/10/30 00:10:09	140
@@ -12,7 +12,7 @@
 use Text::Unaccent;
 
 use lib '..';
-use index_DBI;
+use index_DBI_cache;
 use back2html;
 
 
@@ -26,6 +26,7 @@
 my $INDEX = $cfg_global->val('webpac', 'index') || die "need index in global.conf, section webpac";
 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;
 
 
 Text::Iconv->raise_error(0);     # Conversion errors raise exceptions
@@ -78,6 +79,7 @@
 	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++) {
 
@@ -89,6 +91,9 @@
 		push @persist_vars, "f$i";
 		push @persist_vars, "v$i";
 
+		push @url_params,"f$i=".$q->url_param("f$i");
+		push @url_params,"v$i=".$q->url_param("v$i");
+
 		# re-write query from +/- to and/and not
 		my @param_vals = $q->param("v$i");
 		my @swish_q;
@@ -107,7 +112,10 @@
 					$s.= ($s) ? "and " : "";
 					$s.="not " if ($1 eq "-");
 					$s.="$2* ";
-				} elsif (m/(and|or|not)/i) {
+				} elsif (m/^\s*(and|or|not)\s*$/i) {
+					$s.="$_ ";
+				# don't add * to words with less than x chars
+				} elsif (length($_) <= $MIN_WILDCARD) {
 					$s.="$_ ";
 				} else {
 					$s.="$_* ";
@@ -121,7 +129,7 @@
 		push @s_arr, $q->param("f$i")."_swish=(".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;
@@ -158,6 +166,8 @@
 		$sw_q .= join("\" or swishdocpath=\"",@path_arr);
 		$sw_q .= "\")";
 		$tmpl->param('full',1);	# show full records
+	} else {
+		$tmpl->param('full',0);
 	}
 
 	my $hits = $sh->query($sw_q);
@@ -168,6 +178,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
@@ -178,7 +190,7 @@
 			my @result;
 			for (my $i=0; $i<$rows; $i++) {
 				my $r = $swish_results[$offset+$i];
-				if ($r && $q->param('show_full')) {
+				if ($r && $tmpl->param('full')) {
 					push @result, $r;
 				} elsif ($r) {
 					# if not full output, skip html
@@ -223,7 +235,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);
@@ -231,7 +243,7 @@
 		return $html;
 	}
 
-	my $tmpl = $self->load_tmpl('index_res.html');
+	my $tmpl = $self->load_tmpl('index_res.html', global_vars => 1);
 	$tmpl->param('field',$field);
 	$tmpl->param('limit',$limit);
 	$tmpl->param('total',$total);
@@ -246,7 +258,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,