X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=vhost%2Fwebpac2.cgi;h=5e4ac0ea030d50c36498a7025f0444ed75c3f06c;hb=e85cf693e793caa2069dc9006d5809b72869a265;hp=7368de2635ef0a34d1e714261a30a37b1b6254f7;hpb=992036ed5be628e0ac437b9156ccc7224d888684;p=webpac2
diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 7368de2..5e4ac0e 100755
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -11,9 +11,12 @@ 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;
+my @entries_per_page = ( 30, 50, 100, 500 );
my $debug = param('debug');
print header(
@@ -125,19 +128,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++;
}
}
@@ -148,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||,
start_form( -action => self_url( query => 0 ) ),
checkbox_group(
@@ -156,19 +171,21 @@ sub search_form {
# -linebreak => 0,
),
textfield( -name => 'search' ),
- popup_menu( -name => 'attr_operator', %$attr_operators ),
- submit,
- hidden( -name => 'entries_per_page', -default => $entries_per_page ),
+ $attr_operators ? popup_menu( -name => 'attr_operator', %$attr_operators ) : '',
+ 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||,
checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
qq||,
- h2( 'Select input' ),
+ $inputs_available > 1 ?
+ h2( 'Select input' ) .
checkbox_group(
-name => 'only_input',
%$only_input,
-linebreak=> 'true',
- ),
+ ) : '',
qq|
|,
end_form,
;
@@ -186,6 +203,8 @@ print
if ( my $search = param('search') ) {
+ $search = unac_string( Encode::decode('utf-8',$search) );
+
print qq|
#
@@ -195,43 +214,53 @@ if ( my $search = param('search') ) {
$swish->abort_last_error if $swish->Error;
my @search = ();
- if ( $search =~ m{(=|"|AND|OR)} ) {
+ my @attrs = param('attr');
+ my $op = param('attr_operator');
+
+ if ( $search =~ m{(=|"|\bAND\b|\bOR\b)} ) {
push @search, $search;
- } elsif ( my $op = param('attr_operator') ) {
- my $attr = param('attr') || 'all';
- my $v = $search;
- $v =~ s/^\s+//;
- warn "-- v: $v\n";
- sub rewrite {
- my ( $whitespace, $v ) = @_;
- warn "## filter $op $whitespace $v\n";
- my $template = $op;
- $template =~ s{Q}{$v};
- $whitespace = " AND " if $whitespace;
-
- return
- $whitespace .
- $attr . '="' . $template . '"';
- ;
- };
- if ( $op =~ m{\s} ) {
- my $template = $op;
- $template =~ s{Q}{$v};
- $v = $attr . '="' . $template . '"';
- } else {
- $v =~ s{(\s*)(\S+)}{rewrite($1,$2)}ge;
+ } elsif ( @attrs ) {
+
+ $op ||= 'Q*';
+ my @or;
+ foreach my $attr ( @attrs ) {
+ my $v = $search;
+ $v =~ s/^\s+//;
+ warn "-- v: $v\n";
+ sub rewrite {
+ my ( $attr, $whitespace, $v ) = @_;
+ warn "## filter $op $whitespace $v\n";
+ my $template = $op;
+ $template =~ s{Q}{$v};
+ $whitespace = " AND " if $whitespace;
+
+ return
+ $whitespace .
+ $attr . '="' . $template . '"';
+ ;
+ };
+ if ( $op =~ m{\s} ) {
+ my $template = $op;
+ $template =~ s{Q}{$v};
+ $v = $attr . '="' . $template . '"';
+ } else {
+ $v =~ s{(\s*)(\S+)}{rewrite($attr,$1,$2)}ge;
+ }
+
+ push @or, $v;
+
}
+ push @search, '(' . join(') OR (', @or) . ')';
- push @search, $v;
-
- my @only_input = param('only_input');
- push @search, '((' . join(') OR (', map { "input=\"$_\"" } @only_input) . '))' if @only_input;
} else {
push @search, "all=\"$search\"";
}
my $q = '(' . join(') AND (', @search) . ')';
- $q =~ s{\(\((.+)\)\)}{($1)};
+
+ my @only_input = param('only_input');
+ $q .= ' AND ((' . join(') OR (', map { "input=\"$_\"" } @only_input) . '))' if @only_input;
+
warn "# query: $q\n";
my $swish_results = $swish->query( $q );
@@ -267,9 +296,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;
@@ -278,7 +312,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} = $@;