X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=vhost%2Fwebpac2.cgi;h=1f77b8f12fddc042cd390a5cff54e4fb0bf7ff2e;hb=dd90d5ad6ed43a985d367818cd6238973d32bbca;hp=812793595bc3f6aa836876a974535940cfb42b62;hpb=69577da33be9ae1baf558413c78037c2ed64189d;p=webpac2
diff --git a/vhost/webpac2.cgi b/vhost/webpac2.cgi
index 8127935..1f77b8f 100755
--- a/vhost/webpac2.cgi
+++ b/vhost/webpac2.cgi
@@ -8,14 +8,73 @@ use CGI::Carp qw/fatalsToBrowser/;
use File::Slurp;
use YAML;
use Search::Estraier;
+use Data::Page;
+use Data::Dump qw/dump/;
-print header;
+my $range_around = 5;
+my $entries_per_page = 30;
+my $debug = param('debug');
+
+print header(
+ -charset => 'utf-8',
+);
sub dump_yaml {
- print qq|
|, YAML::Dump( @_ ), qq|
|;
+ my $name = shift;
+ print qq|# $name\n|, YAML::Dump( @_ ), qq|
| if $debug;
+}
+
+sub show_pager {
+ my ($pager) = @_;
+
+ my @show_pages;
+ my $after_current = 0;
+
+ if ( $pager->current_page <= $range_around + 2 ) {
+ @show_pages = ( $pager->first_page .. $pager->current_page );
+ $after_current = $range_around - $pager->current_page;
+ } else {
+ @show_pages = ( $pager->first_page, '', $pager->current_page - $range_around .. $pager->current_page );
+ }
+
+ if ( $pager->current_page + $after_current + $range_around + 1 >= $pager->last_page ) {
+ push @show_pages, ( $pager->current_page + 1 .. $pager->last_page );
+ } else {
+ push @show_pages, ( $pager->current_page + 1 .. $pager->current_page + $after_current + $range_around, '', $pager->last_page );
+ }
+
+# 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|$label|;
+ }
+
+ return
+ $pager->previous_page ? li_a_href( $pager->previous_page, $prev ) : qq|$prev|
+ , ( map {
+ if ( $_ eq $pager->current_page ) {
+ qq|$_|;
+ } elsif ( $_ eq '' ) {
+ qq|...|;
+ } else {
+ li_a_href( $_ );
+ }
+ } @show_pages )
+ , $pager->next_page ? li_a_href( $pager->next_page, $next ) : qq|$next|
+ ;
+
}
-my $path = $ENV{PATH_INFO};
+my $path = $ENV{PATH_INFO} || 'ecas';
my $dir = $0;
$dir =~ s{/[^/]+.cgi}{};
@@ -24,6 +83,15 @@ my $config = YAML::LoadFile( "$dir/$path/config.yml" );
my $database = (keys %{ $config->{databases} })[0];
die "$database not in $path" unless $path =~ m{\Q$database\E};
+my $html_markup = "$dir/$path/html.pm";
+my $html_markup_skip;
+if ( -e $html_markup ) {
+ require $html_markup;
+ $html_markup = $database . '::html';
+} else {
+ undef $html_markup;
+}
+
my $estraier = YAML::LoadFile( "$dir/../var/estraier/$database.yaml" );
my $db = $config->{databases}->{$database};
@@ -37,49 +105,120 @@ print
),
h1( $db->{name} ),
qq||, $db->{description}, qq|
|,
- start_form,
+ start_form( -action => self_url( query => 0 ) ),
radio_group(
-name => 'attr',
- -values => [ 'issn', 'naslov' ],
+ -values => [ @attr ],
# -linebreak => 0,
),
textfield( -name => 'search' ),
- submit
+ popup_menu( -name => 'attr_operator', -values => [ '', 'STRBW', 'STREQ' ],
+ -labels => {
+ '' => 'Bilo koja rijeÄ',
+ 'STRBW' => 'PoÄetak',
+ 'STREQ' => 'ToÄan oblik',
+ },
+ ),
+ submit,
+ hidden( -name => 'entries_per_page', -default => $entries_per_page ),
+ hidden( -name => 'current_page', -default => 1 ),
+ checkbox( -name => 'debug', -default => 0 ), # FIXME hidden?
+ qq||,
+ h2( 'Select input' ),
+ checkbox_group(
+ -name => 'only_input',
+ -values => [ map { $_->{name} } @{ $db->{input} } ],
+ -linebreak=> 'true',
+ ),
+ qq|
|,
+
;
+dump_yaml( 'inputs', $db->{input} );
+dump_yaml( 'input names', map { $_->{name} } @{ $db->{input} } );
+
print end_form;
if ( my $search = param('search') ) {
- print qq|search: $search|;
+ print qq|
|;
my $node = Search::Estraier::Node->new(
url => $config->{hyperestraier}->{masterurl} . '/node/' . $database,
croak_on_error => 1,
);
- my $cond = Search::Estraier::Condition->new;
+ 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 $cond = Search::Estraier::Condition->new( debug => $debug );
$cond->set_phrase( $search );
+ $cond->set_skip( $pager->skipped );
+ $cond->set_max( $pager->entries_per_page );
+
+ if ( my $op = param('attr_operator') ) {
+ $cond->add_attr( param('attr') . " $op " . param('search') );
+ }
+
+ foreach my $i ( param('only_input') ) {
+ $cond->add_attr( '@uri STRBW file:///search/' . $database . '/' . $i );
+ }
+
+
my $nres = $node->search( $cond, 0 );
+ $pager->total_entries( $nres->hits );
+
+ dump_yaml( 'cond', $cond );
+ dump_yaml( 'nres', $nres );
if ( ! $nres ) {
my $no_results = "No results for search '%s'";
- printf qq|
$no_results|, $search;
+ printf qq|
$no_results
\n\n|, $search;
} else {
- print qq|
|;
+
+ 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 $pager_html = join("\n", show_pager( $pager ));
+
+ print qq|\n\n| if $pager_html;
+
+ my $start = $pager->first;
+ print qq|\n|;
+
foreach my $i ( 1 .. $nres->doc_num ) {
my $rdoc = $nres->get_doc( $i - 1 );
print qq|- |;
- print qq|
|, $rdoc->attr( $_ ), qq|
|
- foreach @attr;
+ foreach my $attr ( @attr ) {
+ my $v = $rdoc->attr( $attr );
+ if ( defined $v && $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|$v
\n|;
+ }
print qq| \n|;
}
- print qq|
|;
+ print qq|\n\n|;
+
+ print qq|\n\n| if $pager_html;
}
print qq|
|;
+
+ dump_yaml( 'pager', $pager );
+
}
-dump_yaml( $estraier );
-dump_yaml( $db );
+dump_yaml( 'estraier', $estraier );
+dump_yaml( 'db', $db );
+dump_yaml( 'html_markup_skip', $html_markup_skip );
print end_html;