work on Koha search with webpac

[webpac2] / vhost / webpac2.cgi

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 19dae1a..2abdb4c 100755 (executable)
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -11,6 +11,8 @@ use Data::Page;
 use Data::Dump qw/dump/;
 use SWISH::API;
 use JSON;
+use Text::Unaccent::PurePerl qw/unac_string/;
+use HTML::FillInForm::Lite;
 
 my $range_around = 5;
 my @entries_per_page = ( 30, 50, 100, 500 );
@@ -136,6 +138,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 +153,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 +202,8 @@ print
 
 if ( my $search = param('search') ) {
 
+       $search = unac_string( $search );
+
        print qq|
                <a href="#form" class="skip" title="skip to search form">#</a>
                <div id="results">
@@ -281,9 +295,14 @@ if ( my $search = param('search') ) {
 
                while ( my $result = $swish_results->next_result ) {
 
-                       my $data = from_json( $result->property('data'), {utf8 => 1} );
-
+                       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;