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;
+my @entries_per_page = ( 30, 50, 100, 500 );
my $debug = param('debug');
print header(
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++;
}
}
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(
),
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,
;
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">
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 ) {
$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 . '"';
$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 );
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;
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} = $@;