+ |;
my $swish = SWISH::API->new( "$dir/../var/swish/$database" );
$swish->abort_last_error if $swish->Error;
- param( 'entries_per_page', $entries_per_page ) unless param('entries_per_page'); # FIXME not needed?
- my $pager = Data::Page->new;
- $pager->total_entries( param('current_page') * param('entries_per_page') );
- $pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );
-
- dump_yaml( 'pager', $pager );
-
my @search = ();
if ( $search =~ m{(=|"|AND|OR)} ) {
push @search, $search;
@@ -199,12 +209,18 @@ if ( my $search = param('search') ) {
$attr . '="' . $template . '"';
;
};
- $v =~ s{(\s*)(\S+)}{rewrite($1,$2)}ge;
+ if ( $op =~ m{\s} ) {
+ my $template = $op;
+ $template =~ s{Q}{$v};
+ $v = $attr . '="' . $template . '"';
+ } else {
+ $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;
+ push @search, '((' . join(') OR (', map { "input=\"$_\"" } @only_input) . '))' if @only_input;
} else {
push @search, "all=\"$search\"";
}
@@ -216,8 +232,14 @@ if ( my $search = param('search') ) {
dump_yaml( 'swish_results', $swish_results );
+ my $pager = Data::Page->new;
+ $pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );
$pager->total_entries( $swish_results->hits );
+ dump_yaml( 'pager', $pager );
+
+ $swish_results->seek_result( $pager->first - 1 );
+
if ( ! $pager->total_entries ) {
my $no_results = 'No results for search
%s';
$no_results = $swish->error_string . '
%s' if $swish->error;
@@ -231,13 +253,22 @@ if ( my $search = param('search') ) {
print qq|\n\n| if $pager_html;
- my $start = $pager->first;
- print qq|
\n|;
+ my $nr = $pager->first;
+ print qq|\n|;
+
+ my $limit = $pager->entries_on_this_page;
+
+ my $nr = 1;
while ( my $result = $swish_results->next_result ) {
+
my $data = from_json $result->property('data');
- print qq|- |;
+ dump_yaml( 'data', $data );
+
+ my $li_class = '';
+ $li_class = qq| class="z"| if $nr % 2 == 0;
+ print qq|
- |;
foreach my $attr ( @attr ) {
next unless defined $data->{$attr};
my $v = $data->{$attr};
@@ -248,9 +279,12 @@ if ( my $search = param('search') ) {
$html_markup_skip->{$attr} = $@;
}
}
- print qq|
$v
\n|;
+ my $label = $attr_labels->{'-labels'}->{$attr} || $attr;
+ print qq|$v
\n|;
}
print qq| \n|;
+
+ last if $nr++ == $pager->last;
}
print qq|
\n\n|;
@@ -262,6 +296,8 @@ if ( my $search = param('search') ) {
}
+print search_form;
+
dump_yaml( "config databases $database", $db );
dump_yaml( 'html_markup_skip', $html_markup_skip );