use CGI::Carp qw/fatalsToBrowser/;
use File::Slurp;
use YAML;
-use Search::Estraier;
use Data::Page;
use Data::Dump qw/dump/;
+use SWISH::API;
+use JSON;
my $range_around = 5;
my $entries_per_page = 30;
+my $debug = param('debug');
-print header;
+print header(
+ -charset => 'utf-8',
+);
sub dump_yaml {
my $name = shift;
- print qq|<pre># $name\n|, YAML::Dump( @_ ), qq|</pre>|;
+ print qq|<pre># $name\n|, YAML::Dump( @_ ), qq|</pre>| if $debug;
}
sub show_pager {
- my ($pager,$coderef) = @_;
+ my ($pager) = @_;
my @show_pages;
my $after_current = 0;
push @show_pages, ( $pager->current_page + 1 .. $pager->current_page + $after_current + $range_around, '', $pager->last_page );
}
- dump_yaml( 'show_pages', \@show_pages );
+# dump_yaml( 'show_pages', \@show_pages );
return '' unless $#show_pages;
my ( $prev, $next ) = ( '<<', '>>' );
+ sub li_a_href {
+ my ( $page, $label, $attr ) = @_;
+ param( 'current_page', $page );
+ my $url = self_url( -query => 1 );
+ $attr ||= '';
+ $label ||= $page;
+ qq|<li$attr><a href="$url" title="$page">$label</a></li>|;
+ }
+
return
- $pager->previous_page ? $coderef->( $pager->previous_page, $prev ) : $prev
- , join( ' ', map {
- if ( $_ == $pager->current_page ) {
- qq|<span class=current_page>$_</span>|;
+ $pager->previous_page ? li_a_href( $pager->previous_page, $prev ) : qq|<li class=skip>$prev</li>|
+ , ( map {
+ if ( $_ eq $pager->current_page ) {
+ qq|<li class=current_page>$_</li>|;
} elsif ( $_ eq '' ) {
- qq|<span class=skip>...</span>|;
+ qq|<li class=skip>...</li>|;
} else {
- $coderef->( $_ );
+ li_a_href( $_ );
}
} @show_pages )
- , $pager->next_page ? $coderef->( $pager->next_page, $next ) : $next
+ , $pager->next_page ? li_a_href( $pager->next_page, $next ) : qq|<li class=skip>$next</li>|
;
}
# -linebreak => 0,
),
textfield( -name => 'search' ),
+ popup_menu( -name => 'attr_operator', -values => [ '', 'STRBW', 'STREQ' ],
+ -labels => {
+ '' => 'Bilo koja riječ',
+ 'STRBW' => 'Početak',
+ 'STREQ' => 'Točan oblik',
+ },
+ ),
submit,
- textfield( -name => 'entries_per_page', -default => $entries_per_page ),
- textfield( -name => 'current_page', -default => 1 ),
+ hidden( -name => 'entries_per_page', -default => $entries_per_page ),
+ hidden( -name => 'current_page', -default => 1 ),
+ checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
+ qq|<div id=inputs>|,
+ h2( 'Select input' ),
+ checkbox_group(
+ -name => 'only_input',
+ -values => [ map { $_->{name} } @{ $db->{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') ) {
print qq|<div id="results">|;
- my $node = Search::Estraier::Node->new(
- url => $config->{hyperestraier}->{masterurl} . '/node/' . $database,
- croak_on_error => 1,
- );
+ 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;
dump_yaml( 'pager', $pager );
- my $cond = Search::Estraier::Condition->new;
- $cond->set_phrase( $search );
- $cond->set_skip( $pager->skipped );
- $cond->set_max( $pager->entries_per_page );
- my $nres = $node->search( $cond, 0 );
- $pager->total_entries( $nres->hits );
+ 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;
- dump_yaml( 'cond', $cond );
+ my $q = '(' . join(') and (', @search) . ')';
+ warn "# query: $q\n";
+ my $swish_results = $swish->query( $q );
+ $swish->abort_last_error if $swish->Error;
- if ( ! $nres ) {
+ dump_yaml( 'swish_results', $swish_results );
+
+ $pager->total_entries( $swish_results->hits );
+
+ if ( ! $pager->total_entries ) {
my $no_results = "No results for search '%s'";
- printf qq|<div class="error">$no_results</div>|, $search;
+ printf qq|<div class="error">$no_results</div>\n\n|, $search;
} else {
- my $results = "Got %d results for search '%s'";
- printf qq|<div class="message">$results</div>|, $nres->hits, $search;
-
- print
- qq|<div class=pager>|,
- join(' ', show_pager( $pager,
- sub {
- my ($page,$label) = @_;
- param( 'current_page', $page );
- my $url = self_url( -query => 1 );
- $label = $page unless defined $label;
- qq|<a href="$url">$label</a>|;
- }
- )),
- qq|</div>|
- ;
+ 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 $pager_html = join("\n", show_pager( $pager ));
+
+ print qq|<ul class="pager">$pager_html</ul>\n\n| if $pager_html;
my $start = $pager->first;
- print qq|<ol start=$start>|;
+ print qq|<ol start=$start>\n|;
+
+ while ( my $result = $swish_results->next_result ) {
+ my $data = from_json $result->property('data');
- foreach my $i ( 1 .. $nres->doc_num ) {
- my $rdoc = $nres->get_doc( $i - 1 );
print qq|<li>|;
foreach my $attr ( @attr ) {
- my $v = $rdoc->attr( $attr );
- if ( defined $v && $html_markup && ! $html_markup_skip->{$attr} ) {
+ next unless defined $data->{$attr};
+ my $v = $data->{$attr};
+ if ( $html_markup && ! $html_markup_skip->{$attr} ) {
eval "\$v = $html_markup->$attr( \$v );";
if ( $@ ) {
warn "disable html markup for $attr: $@";
$html_markup_skip->{$attr} = $@;
}
}
- next unless defined $v;
print qq|<div><label>$attr</label><span class=$attr>$v</span></div>\n|;
}
print qq|</li>\n|;
}
- print qq|</ol>|;
+ print qq|</ol>\n\n|;
+
+ print qq|<ul class="pager bottom">$pager_html</ul>\n\n| if $pager_html;
}
print qq|</div>|;
}
-dump_yaml( 'estraier', $estraier );
dump_yaml( 'db', $db );
dump_yaml( 'html_markup_skip', $html_markup_skip );
projects / webpac2 / blobdiff