Merge branch 'tab'

[webpac2] / vhost / webpac2.cgi

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 67c2c4f..fd76b65 100755 (executable)
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -11,6 +11,9 @@ use Data::Page;
 use Data::Dump qw/dump/;
 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 );
@@ -136,6 +139,7 @@ my $inputs_available = 0;
 
 foreach ( @{ $db->{input} } ) {
        my $input = $_->{name} || die "no name in ",dump( $_ );
+       next unless defined $stats->{input}->{$input}; # skip inputs without data
        if ( ! $only_input->{'-labels'}->{$input} ) {
                push @{ $only_input->{'-values'} }, $input;
                        $only_input->{'-labels'}->{$input} = $_->{description} || $input;
@@ -150,6 +154,15 @@ push @style, "../../$path/$path.css" if -e "$dir/$path/$path.css";
 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(
@@ -190,6 +203,8 @@ print
 
 if ( my $search = param('search') ) {
 
+       $search = unac_string( Encode::decode('utf-8',$search) );
+
        print qq|
                <a href="#form" class="skip" title="skip to search form">#</a>
                <div id="results">
@@ -202,7 +217,7 @@ if ( my $search = param('search') ) {
        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 ) {
 
@@ -219,6 +234,9 @@ if ( my $search = param('search') ) {
                                   $template =~ s{Q}{$v};
                                $whitespace = " AND " if $whitespace;
 
+                               # don't return -* &* and other non-word characters
+                               return '' if $template =~ m/^\W\*$/ || $template =~ m/\band\b/i;
+
                                return
                                        $whitespace .
                                        $attr . '="' . $template . '"';
@@ -247,7 +265,11 @@ if ( my $search = param('search') ) {
        $q .= ' AND ((' . join(') OR (', map { "input=\"$_\"" } @only_input) . '))' if @only_input;
 
        warn "# query: $q\n";
-       my $swish_results = $swish->query( $q );
+       my $search_obj = $swish->new_search_object;
+       if ( my $sort = param('sort') ) {
+               $search_obj->set_sort( $sort );
+       }
+       my $swish_results = $search_obj->execute( $q );
 
        dump_yaml( 'swish_results', $swish_results );
 
@@ -281,9 +303,14 @@ if ( my $search = param('search') ) {
 
                while ( my $result = $swish_results->next_result ) {
 
-                       my $data = from_json $result->property('data');
-
+                       my $data = $result->property('data');
                        dump_yaml( 'data', $data );
+                       # FIXME if we produce valid json we shouldn't need eval here!
+                       eval { $data = from_json( $data, {utf8 => 1} ); };
+                       if ( $@ ) {
+                               warn "ERROR: $@ from ",dump( $data );
+                               next;
+                       }
 
                        my $li_class = '';
                        $li_class = qq| class="z"| if $nr % 2 == 0;