+ |;
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 = ();
+ my @attrs = param('attr');
+ my $op = param('attr_operator');
+
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;
+ } 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) . ')';
+
} 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 );
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;
@@ -229,13 +268,22 @@
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};
@@ -245,10 +293,15 @@
warn "disable html markup for $attr: $@";
$html_markup_skip->{$attr} = $@;
}
+ } else {
+ $v =~ s{(http://\S+)}{$1};
}
- 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|;
@@ -260,7 +313,9 @@
}
-dump_yaml( 'db', $db );
+print search_form;
+
+dump_yaml( "config databases $database", $db );
dump_yaml( 'html_markup_skip', $html_markup_skip );
print end_html;