--- trunk/vhost/webpac2.cgi	2009/07/12 15:10:00	1238
+++ trunk/vhost/webpac2.cgi	2009/07/12 18:18:57	1242
@@ -13,7 +13,7 @@
 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(
@@ -136,6 +136,7 @@
 
 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;
@@ -159,8 +160,9 @@
 		),
 		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?
@@ -280,7 +282,7 @@
 
 		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 );