|;
+ $search = unac_string( Encode::decode('utf-8',$search) );
- my $node = Search::Estraier::Node->new(
- url => $config->{hyperestraier}->{masterurl} . '/node/' . $database,
- croak_on_error => 1,
- );
+ print qq|
+
+ |;
+
+ my $swish = SWISH::API->new( "$dir/../var/swish/$database" );
+ $swish->abort_last_error if $swish->Error;
+
+ my @search = ();
+ my @attrs = param('attr');
+ my $op = param('attr_operator');
+
+ if ( $search =~ m{(=|"|\bAND\b|\bOR\b)} ) {
+ push @search, $search;
+ } 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;
+ }
- 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/ );
+ push @or, $v;
+
+ }
+ push @search, '(' . join(') OR (', @or) . ')';
- dump_yaml( 'pager', $pager );
+ } else {
+ push @search, "all=\"$search\"";
+ }
- my $cond = Search::Estraier::Condition->new( debug => $debug );
- $cond->set_phrase( $search );
- $cond->set_skip( $pager->skipped );
- $cond->set_max( $pager->entries_per_page );
+ my $q = '(' . join(') AND (', @search) . ')';
- if ( my $op = param('attr_operator') ) {
- $cond->add_attr( param('attr') . " $op " . param('search') );
- }
+ my @only_input = param('only_input');
+ $q .= ' AND ((' . join(') OR (', map { "input=\"$_\"" } @only_input) . '))' if @only_input;
- foreach my $i ( param('only_input') ) {
- $cond->add_attr( '@uri STRBW file:///search/' . $database . '/' . $i );
+ warn "# query: $q\n";
+ 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 );
- my $nres = $node->search( $cond, 0 );
- $pager->total_entries( $nres->hits );
+ my $pager = Data::Page->new;
+ $pager->$_( param($_) ) foreach ( qw/entries_per_page current_page/ );
+ $pager->total_entries( $swish_results->hits );
+
+ dump_yaml( 'pager', $pager );
- dump_yaml( 'cond', $cond );
- dump_yaml( 'nres', $nres );
+ $swish_results->seek_result( $pager->first - 1 );
- if ( ! $nres ) {
- my $no_results = "No results for search '%s'";
- printf qq|
$no_results
\n\n|, $search;
+ if ( ! $pager->total_entries ) {
+ my $no_results = 'No results for search
%s';
+ $no_results = $swish->error_string . '
%s' if $swish->error;
+ printf qq|
$no_results
\n\n|, $q;
} else {
- my $results = "%d results for search '%s' showing results %d - %d on page %d";
- printf qq|
$results
\n\n|, $nres->hits, $search, $pager->first, $pager->last, $pager->current_page;
+ my $results = "
%d results for search
%s showing results %d - %d";
+ printf qq|
$results
\n\n|, $pager->total_entries, $q, $pager->first, $pager->last;
my $pager_html = join("\n", show_pager( $pager ));
print qq|\n\n| if $pager_html;
- my $start = $pager->first;
- print qq|
\n|;
+ my $nr = $pager->first;
+ print qq|\n|;
- foreach my $i ( 1 .. $nres->doc_num ) {
- my $rdoc = $nres->get_doc( $i - 1 );
- print qq|- |;
+ my $limit = $pager->entries_on_this_page;
+
+ my $nr = 1;
+
+ while ( my $result = $swish_results->next_result ) {
+
+ 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;
+ print qq|
- |;
foreach my $attr ( @attr ) {
- my $v = $rdoc->attr( $attr );
- if ( defined $v && $html_markup && ! $html_markup_skip->{$attr} ) {
- eval "\$v = $html_markup->$attr( \$v );";
+ next unless defined $data->{$attr};
+ my $v = $data->{$attr};
+ if ( $html_markup && ! $html_markup_skip->{$attr} ) {
+ eval "\$v = $html_markup->$attr( \$v, \$data );";
if ( $@ ) {
warn "disable html markup for $attr: $@";
$html_markup_skip->{$attr} = $@;
}
+ } else {
+ $v =~ s{(http://\S+)}{$1};
}
- next unless defined $v;
- 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|;
@@ -217,8 +341,9 @@
}
-dump_yaml( 'estraier', $estraier );
-dump_yaml( 'db', $db );
+print search_form;
+
+dump_yaml( "config databases $database", $db );
dump_yaml( 'html_markup_skip', $html_markup_skip );
print end_html;