--- trunk/vhost/webpac2.cgi 2009/04/21 23:17:23 1137 +++ trunk/vhost/webpac2.cgi 2009/04/22 13:20:49 1140 @@ -8,6 +8,11 @@ use File::Slurp; use YAML; use Search::Estraier; +use Data::Page; +use Data::Dump qw/dump/; + +my $range_around = 5; +my $entries_per_page = 30; print header; @@ -16,6 +21,47 @@ print qq|
# $name\n|, YAML::Dump( @_ ), qq|
|; } +sub show_pager { + my ($pager,$coderef) = @_; + + 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 ) = ( '<<', '>>' ); + + return + $pager->previous_page ? $coderef->( $pager->previous_page, $prev ) : qq|$prev| + , join( ' ', map { + if ( $_ == $pager->current_page ) { + qq|$_|; + } elsif ( $_ eq '' ) { + qq|...|; + } else { + $coderef->( $_ ); + } + } @show_pages ) + , $pager->next_page ? $coderef->( $pager->next_page, $next ) : qq|$next| + ; + +} + my $path = $ENV{PATH_INFO} || 'ecas'; my $dir = $0; $dir =~ s{/[^/]+.cgi}{}; @@ -47,14 +93,16 @@ ), h1( $db->{name} ), qq|
|, $db->{description}, qq|
|, - start_form, + start_form( -action => self_url( query => 0 ) ), radio_group( -name => 'attr', -values => [ @attr ], # -linebreak => 0, ), textfield( -name => 'search' ), - submit + submit, + textfield( -name => 'entries_per_page', -default => $entries_per_page ), + textfield( -name => 'current_page', -default => 1 ), ; print end_form; @@ -68,18 +116,47 @@ croak_on_error => 1, ); + 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; $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 ); + + + dump_yaml( 'cond', $cond ); if ( ! $nres ) { my $no_results = "No results for search '%s'"; printf qq|
$no_results
|, $search; } else { - my $results = "Got %d results for search '%s'"; - printf qq|
$results
|, $nres->hits, $search; - print qq|
    |; + my $results = "%d results for search '%s' showing results %d - %d on page %d"; + printf qq|
    $results
    |, $nres->hits, $search, $pager->first, $pager->last, $pager->current_page; + + my $pager_html = + join(' ', show_pager( $pager, + sub { + my ($page,$label) = @_; + param( 'current_page', $page ); + my $url = self_url( -query => 1 ); + $label = $page unless defined $label; + qq|$label|; + } + )) + ; + + print qq|
    $pager_html
    | if $pager_html; + + my $start = $pager->first; + print qq|
      |; foreach my $i ( 1 .. $nres->doc_num ) { my $rdoc = $nres->get_doc( $i - 1 ); @@ -99,8 +176,13 @@ print qq|\n|; } print qq|
    |; + + print qq|
    $pager_html
    | if $pager_html; } print qq||; + + dump_yaml( 'pager', $pager ); + } dump_yaml( 'estraier', $estraier );