releasing version 1.23

[git.ikiwiki.info.git] / IkiWiki / Plugin / pagestats.pm

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 34fd11715d24e03fa7012023a97c1aef7d86d13d..8ce563fc5ac489260db3122dc842621a8a51ae8b 100644 (file)
--- 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;
@@ -33,8 +33,8 @@ sub preprocess (@) { #{{{
        
        my %counts;
        my $max = 0;
-       foreach my $page (%IkiWiki::links) {
-               if (IkiWiki::globlist_match($page, $params{pages})) {
+       foreach my $page (keys %IkiWiki::links) {
+               if (IkiWiki::pagespec_match($page, $params{pages})) {
                        my @bl = IkiWiki::backlinks($page);
                        $counts{$page} = scalar(@bl);
                        $max = $counts{$page} if $counts{$page} > $max;
@@ -42,18 +42,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>".
+                               IkiWiki::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\">".
+                               IkiWiki::htmllink($params{page}, $params{destpage}, $page).
+                               "</span>\n";
                }
                $res .= "</div>\n";