--- trunk/WebPac.pm	2003/07/05 23:07:47	76
+++ trunk/WebPac.pm	2003/09/03 20:08:26	122
@@ -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
@@ -77,12 +78,18 @@
 	my @path_arr = $q->param('path');
 	my $full = $q->param('full');
 
+	my @persist_vars = ( 'rm' ); 
+
 	for(my $i = 1; $i <=30; $i++) {
 
 		return show_index($self, $i) if ($q->param("f".$i."_index"));
+
 		next if (! $q->param("v$i"));
 		next if (! $q->param("f$i"));
 
+		push @persist_vars, "f$i";
+		push @persist_vars, "v$i";
+
 		# re-write query from +/- to and/and not
 		my @param_vals = $q->param("v$i");
 		my @swish_q;
@@ -101,7 +108,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.="$_* ";
@@ -117,6 +127,13 @@
 
 	my $tmpl = $self->load_tmpl('results.html');
 
+	sub esc_html {
+		my $html = shift;
+		$html =~ s/</&lt;/g;
+		$html =~ s/>/&gt;/g;
+		return $html;
+	}
+
 	# call swish
 	my $sh = SWISH->connect('Fork',
 		prog     => $SWISH,
@@ -128,7 +145,7 @@
 			push @swish_results, {
 				nr => ($#swish_results + 2),
 				path => $hit->swishdocpath,
-				headline => $from_utf8->convert($hit->headline),
+				headline => esc_html($from_utf8->convert($hit->headline)),
 				html => back2html($from_utf8->convert($hit->html)),
 				rank => $hit->swishrank };
 
@@ -140,11 +157,13 @@
 	die $SWISH::errstr unless $sh;
 	# construct swish query
 	my $sw_q = join(" and ",@s_arr);
-	if (@path_arr) {
+	if (@path_arr && $q->param('show_full')) {
 		$sw_q .= "and (swishdocpath=\"";
 		$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);
@@ -164,25 +183,21 @@
 
 			my @result;
 			for (my $i=0; $i<$rows; $i++) {
-				push @result, $swish_results[$offset+$i] if $swish_results[$offset+$i];
+				my $r = $swish_results[$offset+$i];
+				if ($r && $tmpl->param('full')) {
+					push @result, $r;
+				} elsif ($r) {
+					# if not full output, skip html
+					delete $r->{html};
+					push @result, $r;
+				}
 			}
 			return \@result;
 		},
 		rows => $hits,
 		page_size => $ON_PAGE,
 		# some optional parameters
-		persist_vars => [
-			'rm',
-			'f1', 'v1',
-			'f2', 'v2',
-			'f3', 'v3',
-			'f4', 'v4',
-			'f5', 'v5',
-			'f6', 'v6',
-			'f7', 'v7',
-			'f8', 'v8',
-			'f9', 'v9',
-			],
+		persist_vars => [ @persist_vars ],
 		#cell_space_color => '#000000',
 		#cell_background_color => '#ffffff',
 		#nav_background_color => '#dddddd',