--- trunk/vhost/webpac2.cgi	2009/04/22 12:51:23	1139
+++ trunk/vhost/webpac2.cgi	2009/04/22 14:27:25	1141
@@ -13,16 +13,17 @@
 
 my $range_around = 5;
 my $entries_per_page = 30;
+my $debug = param('debug');
 
 print header;
 
 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;
@@ -40,24 +41,33 @@
 		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 ) = ( '&lt;&lt;', '&gt;&gt;' );
 
+	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 {
+		  $pager->previous_page ? li_a_href( $pager->previous_page, $prev ) : qq|<li class=skip>$prev</li>|
+		, ( map {
 			if ( $_ == $pager->current_page ) {
-				qq|<span class=current_page>$_</span>|;
+				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>|
 		;
 		
 }
@@ -130,32 +140,25 @@
 	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|<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;
+		my $results = "%d results for search '%s' showing results %d - %d on page %d";
+		printf qq|<div class="message">$results</div>\n\n|, $nres->hits, $search, $pager->first, $pager->last, $pager->current_page;
 
-		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>|
-		;
+		dump_yaml( 'pager html', show_pager( $pager ));
+
+		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|;
 
 		foreach my $i ( 1 .. $nres->doc_num ) {
 			my $rdoc = $nres->get_doc( $i - 1 );
@@ -174,7 +177,9 @@
 			}
 			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>|;