--- trunk/vhost/webpac2.cgi 2009/04/21 23:17:21 1135 +++ trunk/vhost/webpac2.cgi 2009/04/22 14:27:25 1141 @@ -8,15 +8,71 @@ 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; +my $debug = param('debug'); print header; sub dump_yaml { my $name = shift; - print qq|
# $name\n|, YAML::Dump( @_ ), qq|
|; + print qq|
# $name\n|, YAML::Dump( @_ ), qq|
| if $debug; } -my $path = $ENV{PATH_INFO}; +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|| + , ( map { + if ( $_ == $pager->current_page ) { + qq|
  • $_
  • |; + } elsif ( $_ eq '' ) { + qq||; + } else { + li_a_href( $_ ); + } + } @show_pages ) + , $pager->next_page ? li_a_href( $pager->next_page, $next ) : qq|| + ; + +} + +my $path = $ENV{PATH_INFO} || 'ecas'; my $dir = $0; $dir =~ s{/[^/]+.cgi}{}; @@ -25,6 +81,15 @@ 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}; @@ -38,14 +103,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; @@ -59,32 +126,69 @@ 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; + printf qq|
    $no_results
    \n\n|, $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
      \n\n|, $nres->hits, $search, $pager->first, $pager->last, $pager->current_page; + + dump_yaml( 'pager html', show_pager( $pager )); + + 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|
      1. |; - 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|
      2. \n|; } - print qq|
      |; + print qq|
    \n\n|; + + print qq|\n\n| if $pager_html; } print qq||; + + dump_yaml( 'pager', $pager ); + } dump_yaml( 'estraier', $estraier ); dump_yaml( 'db', $db ); +dump_yaml( 'html_markup_skip', $html_markup_skip ); print end_html;