undef $html_markup;
}
-my $estraier = YAML::LoadFile( "$dir/../var/estraier/$database.yaml" );
+my $stats;
+{
+ my $path = "$dir/../var/swish/$database.yaml";
+ $stats = YAML::LoadFile( $path );
+ dump_yaml( "stats $path", $stats );
+}
my $db = $config->{databases}->{$database};
-my @attr = keys %{ $estraier->{attr} }; # FIXME replace with real gnerated lookup
+my @attr = keys %{ $stats->{attr} }; # FIXME replace with real gnerated lookup
+
+# XXX pipe delimit list!
+my $select_attr_operators = << '__ATTR_OPERATORS__';
+Q* | Bilo koja riječ
+BW Q | Početak
+BW Q EW | Točan oblik
+__ATTR_OPERATORS__
+
+my $attr_operator;
+
+foreach ( split(/[\n\r]+/, $select_attr_operators ) ) {
+ my ( $operator,$label ) = split(/\s+\|\s+/,$_,2);
+ push @{ $attr_operator->{ '-values' } }, $operator;
+ $attr_operator->{ '-labels' }->{$operator} = $label;
+}
+
+warn "## attr_operator = ", dump( $attr_operator );
+
+my $only_input;
+
+foreach ( @{ $db->{input} } ) {
+ my $input = $_->{name} || die "no name in ",dump( $_ );
+ if ( ! $only_input->{'-labels'}->{$input} ) {
+ push @{ $only_input->{'-values'} }, $input;
+ $only_input->{'-labels'}->{$input} = $_->{description} || $input;
+ }
+}
+
+warn "## only_input = ", dump( $only_input );
print
start_html(
# -linebreak => 0,
),
textfield( -name => 'search' ),
- popup_menu( -name => 'attr_operator', -values => [ '', 'STRBW', 'STREQ' ],
- -labels => {
- '' => 'Bilo koja riječ',
- 'STRBW' => 'Početak',
- 'STREQ' => 'Točan oblik',
- },
- ),
+ popup_menu( -name => 'attr_operator', %$attr_operator ),
submit,
hidden( -name => 'entries_per_page', -default => $entries_per_page ),
hidden( -name => 'current_page', -default => 1 ),
h2( 'Select input' ),
checkbox_group(
-name => 'only_input',
- -values => [ map { $_->{name} } @{ $db->{input} } ],
+ %$only_input,
-linebreak=> 'true',
),
qq|</div>|,
;
-dump_yaml( 'inputs', $db->{input} );
-dump_yaml( 'input names', map { $_->{name} } @{ $db->{input} } );
-
print end_form;
if ( my $search = param('search') ) {
dump_yaml( 'pager', $pager );
- my @search = ( "xml=$search" );
-
-# if ( my $op = param('attr_operator') ) {
-# $cond->add_attr( param('attr') . " $op " . param('search') );
-# }
-
- my @only_input = param('only_input');
-
- push @search, '(' . join(') or (', @only_input) . ')' if @only_input;
+ my @search = ();
+ if ( $search =~ m{(=|"|AND|OR)} ) {
+ push @search, $search;
+ } elsif ( my $op = param('attr_operator') ) {
+ my $attr = param('attr');
+ 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 . '"';
+ ;
+ };
+ $v =~ s{(\s*)(\S+)}{rewrite($1,$2)}ge;
+
+ 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) . ')';
+ my $q = '(' . join(') AND (', @search) . ')';
+ $q =~ s{\(\((.+)\)\)}{($1)};
warn "# query: $q\n";
my $swish_results = $swish->query( $q );
- $swish->abort_last_error if $swish->Error;
dump_yaml( 'swish_results', $swish_results );
$pager->total_entries( $swish_results->hits );
+ $swish_results->seek_result( $pager->first );
+
if ( ! $pager->total_entries ) {
- my $no_results = "No results for search '%s'";
- printf qq|<div class="error">$no_results</div>\n\n|, $search;
+ my $no_results = 'No results for search <b>%s</b>';
+ $no_results = $swish->error_string . '<br><b>%s</b>' if $swish->error;
+ printf qq|<div class="error">$no_results</div>\n\n|, $q;
} else {
- my $results = "%d results for search '%s' showing results %d - %d on page %d";
- printf qq|<div class="message">$results</div>\n\n|, $pager->total_entries, $search, $pager->first, $pager->last, $pager->current_page;
+ my $results = "<b>%d</b> results for search <b>%s</b> showing results %d - %d";
+ printf qq|<div class="message">$results</div>\n\n|, $pager->total_entries, $q, $pager->first, $pager->last;
my $pager_html = join("\n", show_pager( $pager ));
my $start = $pager->first;
print qq|<ol start=$start>\n|;
+ my $limit = $pager->entries_on_this_page;
+
while ( my $result = $swish_results->next_result ) {
+ last if $limit-- == 0;
+
my $data = from_json $result->property('data');
+ dump_yaml( 'data', $data );
+
print qq|<li>|;
foreach my $attr ( @attr ) {
next unless defined $data->{$attr};
}
-dump_yaml( 'db', $db );
+dump_yaml( "config databases $database", $db );
dump_yaml( 'html_markup_skip', $html_markup_skip );
print end_html;
projects / webpac2 / blobdiff