skip inputs without data

[webpac2] / vhost / webpac2.cgi

diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index edf595b..96cfb85 100755 (executable)
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -13,7 +13,7 @@ use SWISH::API;
 use JSON;
 
 my $range_around = 5;
-my $entries_per_page = 30;
+my @entries_per_page = ( 30, 50, 100, 500 );
 my $debug = param('debug');
 
 print header(
@@ -125,19 +125,22 @@ sub read_config_txt {
 my $attr_labels    = read_config_txt 'labels';
 my $attr_operators = read_config_txt 'operators';
 
-my @attr = @{ $attr_labels->{'-values'} };
+my @attr = @{ $attr_labels->{'-values'} } if $attr_labels;
 @attr = keys %{ $stats->{attr} } unless @attr;
 
 
 warn dump( $attr_labels, $attr_operators );
 
 my $only_input;
+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;
+               $inputs_available++;
        }
 }
 
@@ -157,18 +160,20 @@ sub search_form {
                ),
                textfield( -name => 'search' ),
                $attr_operators ? popup_menu( -name => 'attr_operator', %$attr_operators ) : '',
-               submit,
-               hidden( -name => 'entries_per_page', -default => $entries_per_page ),
+               submit( -value => 'Search' ),
+#              hidden( -name => 'entries_per_page', -default => $entries_per_page ),
+               popup_menu( -name => 'entries_per_page', -values => [ @entries_per_page ], -title => 'entries per page' ),
                # we need current_page fixed at 1 so that every submit through form will reset it
                qq|<input type=hidden name=current_page value=1 >|,
                checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
                qq|<div id=inputs>|,
-               h2( 'Select input' ),
+               $inputs_available > 1 ?
+               h2( 'Select input' ) .
                checkbox_group(
                        -name => 'only_input',
                        %$only_input,
                        -linebreak=> 'true',
-               ),
+               ) : '',
                qq|</div>|,
                end_form,
        ;
@@ -277,7 +282,7 @@ if ( my $search = param('search') ) {
 
                while ( my $result = $swish_results->next_result ) {
 
-                       my $data = from_json $result->property('data');
+                       my $data = from_json( $result->property('data'), {utf8 => 1} );
 
                        dump_yaml( 'data', $data );
 
@@ -288,7 +293,7 @@ if ( my $search = param('search') ) {
                                next unless defined $data->{$attr};
                                my $v = $data->{$attr};
                                if ( $html_markup && ! $html_markup_skip->{$attr} ) {
-                                       eval "\$v = $html_markup->$attr( \$v );";
+                                       eval "\$v = $html_markup->$attr( \$v, \$data );";
                                        if ( $@ ) {
                                                warn "disable html markup for $attr: $@";
                                                $html_markup_skip->{$attr} = $@;