--- trunk/vhost/webpac2.cgi 2009/04/22 12:51:23 1139 +++ trunk/vhost/webpac2.cgi 2009/04/22 13:20:49 1140 @@ -40,14 +40,14 @@ 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 ) = ( '<<', '>>' ); return - $pager->previous_page ? $coderef->( $pager->previous_page, $prev ) : $prev + $pager->previous_page ? $coderef->( $pager->previous_page, $prev ) : qq|$prev| , join( ' ', map { if ( $_ == $pager->current_page ) { qq|$_|; @@ -57,7 +57,7 @@ $coderef->( $_ ); } } @show_pages ) - , $pager->next_page ? $coderef->( $pager->next_page, $next ) : $next + , $pager->next_page ? $coderef->( $pager->next_page, $next ) : qq|$next| ; } @@ -130,6 +130,7 @@ my $nres = $node->search( $cond, 0 ); $pager->total_entries( $nres->hits ); + dump_yaml( 'cond', $cond ); if ( ! $nres ) { @@ -137,11 +138,10 @@ printf qq|
$no_results
|, $search; } else { - my $results = "Got %d results for search '%s'"; - printf qq|
$results
|, $nres->hits, $search; + 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; - print - qq|
|, + my $pager_html = join(' ', show_pager( $pager, sub { my ($page,$label) = @_; @@ -150,10 +150,11 @@ $label = $page unless defined $label; qq|$label|; } - )), - qq|
| + )) ; + print qq|
$pager_html
| if $pager_html; + my $start = $pager->first; print qq|
    |; @@ -175,6 +176,8 @@ print qq|\n|; } print qq|
|; + + print qq|
$pager_html
| if $pager_html; } print qq||;