--- trunk/vhost/webpac2.cgi	2009/07/24 09:29:03	1249
+++ trunk/vhost/webpac2.cgi	2010/03/08 17:28:02	1329
@@ -12,6 +12,8 @@
 use SWISH::API;
 use JSON;
 use Text::Unaccent::PurePerl qw/unac_string/;
+use HTML::FillInForm::Lite;
+use Encode;
 
 my $range_around = 5;
 my @entries_per_page = ( 30, 50, 100, 500 );
@@ -152,6 +154,15 @@
 dump_yaml( 'style', \@style );
 
 sub search_form {
+
+	my $form_html = "$dir/$path/$path-search.html";
+	if ( -e $form_html ) {
+		my $html = read_file( $form_html );
+		my $q = CGI->new();
+		my $h = HTML::FillInForm::Lite->new();
+		return $h->fill(\$html, $q);
+	}
+
 	qq|<a name="form"></a>|,
 	start_form( -action => self_url( query => 0 ) ),
 		checkbox_group(
@@ -192,7 +203,7 @@
 
 if ( my $search = param('search') ) {
 
-	$search = unac_string( $search );
+	$search = unac_string( Encode::decode('utf-8',$search) );
 
 	print qq|
 		<a href="#form" class="skip" title="skip to search form">#</a>
@@ -206,7 +217,7 @@
 	my @attrs = param('attr');
 	my $op = param('attr_operator');
 
-	if ( $search =~ m{(=|"|AND|OR)} ) {
+	if ( $search =~ m{(=|"|\bAND\b|\bOR\b)} ) {
 		push @search, $search;
 	} elsif ( @attrs ) {