--- trunk/WebPac.pm	2003/07/05 21:35:44	71
+++ trunk/WebPac.pm	2003/07/05 22:31:46	73
@@ -9,6 +9,7 @@
 use Text::Iconv;
 use DBI;
 use Config::IniFiles;
+use Text::Unaccent;
 
 use lib '..';
 use index_DBI;
@@ -82,28 +83,35 @@
 		next if (! $q->param("f$i"));
 
 		# re-write query from +/- to and/and not
-		my $s;
-		my $search = $q->param("v$i");
-		while ($search =~ s/\s*("[^"]+")\s*/ /) {
-			$s .= "$1 ";
-		}
-		$search =~ s/^\s+//;
-		$search =~ s/\s+$//;
+		my @param_vals = $q->param("v$i");
+		my @swish_q;
+		while (my $search = shift @param_vals) {
+			my $s;
+			# remove accents
+			$search = unac_string($CHARSET,$search);
+			while ($search =~ s/\s*("[^"]+")\s*/ /) {
+				$s .= "$1 ";
+			}
+			$search =~ s/^\s+//;
+			$search =~ s/\s+$//;
 
-		foreach (split(/\s+/,$search)) {
-			if (m/^([+-])(\S+)/) {
-				$s.= ($s) ? "and " : "";
-				$s.="not " if ($1 eq "-");
-				$s.="$2* ";
-			} elsif (m/(and|or|not)/i) {
-				$s.="$_ ";
-			} else {
-				$s.="$_* ";
+			foreach (split(/\s+/,$search)) {
+				if (m/^([+-])(\S+)/) {
+					$s.= ($s) ? "and " : "";
+					$s.="not " if ($1 eq "-");
+					$s.="$2* ";
+				} elsif (m/(and|or|not)/i) {
+					$s.="$_ ";
+				} else {
+					$s.="$_* ";
+				}
 			}
+			$s =~ s/\*+/*/g;
+			push @swish_q,$s;
 		}
-		$s =~ s/\*+/*/g;
-
-		push @s_arr,$q->param("f$i")."_swish=($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).")";
 	}
 
 	my $tmpl = $self->load_tmpl('results.html');
@@ -129,7 +137,6 @@
 	);
 
 	die $SWISH::errstr unless $sh;
-
 	# construct swish query
 	my $sw_q = join(" and ",@s_arr);
 	if (@path_arr) {
@@ -144,8 +151,8 @@
 	$tmpl->param('hits',$hits);
 	$tmpl->param('search',$sw_q);
 
-	$tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 0);
-	$tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 0);
+	$tmpl->param('PAGER_offset',$q->param("PAGER_offset") || 1);
+	$tmpl->param('last_PAGER_offset',$q->param("last_PAGER_offset") || 1);
 
 	# create a Pager object
 	my $pager = HTML::Pager->new(