X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/d76c73eb8634f3181bd246d747ae42443d4b6d31..eda6949e4dc1c25694b9eade4329344a4d812a84:/IkiWiki/Plugin/pagestats.pm

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 34fd11715..0958f5af6 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -7,7 +7,7 @@
 #          (default)
 #   table: produces a table with the number of backlinks for each page
 #
-# By Enrico Zini.
+# by Enrico Zini
 package IkiWiki::Plugin::pagestats;
 
 use warnings;
@@ -18,8 +18,7 @@ use IkiWiki;
 our @classes = ('smallestPC', 'smallPC', 'normalPC', 'bigPC', 'biggestPC' );
 
 sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "pagestats",
-		call => \&preprocess);
+	hook(type => "preprocess", id => "pagestats", call => \&preprocess);
 } # }}}
 
 sub preprocess (@) { #{{{
@@ -29,12 +28,12 @@ sub preprocess (@) { #{{{
 	
 	# Needs to update whenever a page is added or removed, so
 	# register a dependency.
-	IkiWiki::add_depends($params{page}, $params{pages});
+	add_depends($params{page}, $params{pages});
 	
 	my %counts;
 	my $max = 0;
-	foreach my $page (%IkiWiki::links) {
-		if (IkiWiki::globlist_match($page, $params{pages})) {
+	foreach my $page (keys %links) {
+		if (pagespec_match($page, $params{pages})) {
 			my @bl = IkiWiki::backlinks($page);
 			$counts{$page} = scalar(@bl);
 			$max = $counts{$page} if $counts{$page} > $max;
@@ -42,18 +41,23 @@ sub preprocess (@) { #{{{
 	}
 
 	if ($style eq 'table') {
-		return "<table class='pageStats'>\n".join("\n", map { "<tr><td>$_</td><td>".$counts{$_}."</td></tr>" }
-		      sort { $counts{$b} <=> $counts{$a} } keys %counts)."\n</table>\n" ;
+		return "<table class='pageStats'>\n".
+			join("\n", map {
+				"<tr><td>".
+				htmllink($params{page}, $params{destpage}, $_, 1).
+				"</td><td>".$counts{$_}."</td></tr>"
+			}
+			sort { $counts{$b} <=> $counts{$a} } keys %counts).
+			"\n</table>\n" ;
 	} else {
 		# In case of misspelling, default to a page cloud
 
 		my $res = "<div class='pagecloud'>\n";
 		foreach my $page (sort keys %counts) {
 			my $class = $classes[$counts{$page} * scalar(@classes) / ($max + 1)];
-			my $link = IkiWiki::abs2rel(IkiWiki::htmlpage($page), IkiWiki::dirname($params{page}));
-			$res .= sprintf("<span class='%s'><a href='%s'>%s</a></span>\n",
-					$class, $link, $page);
-				
+			$res .= "<span class=\"$class\">".
+			        htmllink($params{page}, $params{destpage}, $page).
+			        "</span>\n";
 		}
 		$res .= "</div>\n";