--- trunk/WebPac.pm 2003/11/20 21:23:40 163 +++ trunk/WebPac.pm 2003/11/29 19:11:23 190 @@ -28,7 +28,11 @@ 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 @@ -105,11 +109,13 @@ 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 @@ -136,7 +142,9 @@ if ($q->param("e$i")) { $pre = '"' if (! $pre); $post = '"' if (! $post); - $wc = ''; # don't use windcard in exact + # what about wildcards? + $wc = ''; + $wc = '*' if ($q->param("e$i") & 4); $exact = '_exact'; }