Merge commit 'origin/master'

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

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 86ebbe1d5f7732b1c8ab554535395bc74569072b..de4b7d0686f5867a3477873b88a9d6d7074d799f 100644 (file)
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -7,21 +7,29 @@
 #          (default)
 #   table: produces a table with the number of backlinks for each page
 #
 #          (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;
 use strict;
 package IkiWiki::Plugin::pagestats;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 # Names of the HTML classes to use for the tag cloud
 our @classes = ('smallestPC', 'smallPC', 'normalPC', 'bigPC', 'biggestPC' );
 
 sub import { #{{{
 
 # Names of the HTML classes to use for the tag cloud
 our @classes = ('smallestPC', 'smallPC', 'normalPC', 'bigPC', 'biggestPC' );
 
 sub import { #{{{

-       IkiWiki::hook(type => "preprocess", id => "pagestats",
-               call => \&preprocess);
+       hook(type => "getsetup", id => "pagestats", call => \&getsetup);
+       hook(type => "preprocess", id => "pagestats", call => \&preprocess);

 } # }}}
 
 } # }}}
 

+sub getsetup () { #{{{
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 sub preprocess (@) { #{{{
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};
 sub preprocess (@) { #{{{
        my %params=@_;
        $params{pages}="*" unless defined $params{pages};


@@ -29,29 +37,36 @@ sub preprocess (@) { #{{{
        
        # Needs to update whenever a page is added or removed, so
        # register a dependency.
        
        # 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;
        
        my %counts;
        my $max = 0;

-       foreach my $page (%IkiWiki::links) {
-               if (IkiWiki::globlist_match($page, $params{pages})) {
-                       my @bl = IkiWiki::backlinks($page);
-                       $counts{$page} = scalar(@bl);
+       foreach my $page (keys %links) {
+               if (pagespec_match($page, $params{pages}, location => $params{page})) {
+                       use IkiWiki::Render;
+                       $counts{$page} = scalar(IkiWiki::backlinks($page));

                        $max = $counts{$page} if $counts{$page} > $max;
                }
        }
 
        if ($style eq 'table') {
                        $max = $counts{$page} if $counts{$page} > $max;
                }
        }
 
        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" ;
-       } else {
+               return "<table class='pageStats'>\n".
+                       join("\n", map {
+                               "<tr><td>".
+                               htmllink($params{page}, $params{destpage}, $_, noimageinline => 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)];
                        $res .= "<span class=\"$class\">".
                # 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)];
                        $res .= "<span class=\"$class\">".

-                               IkiWiki::htmllink($params{page}, $params{destpage}, $page).
+                               htmllink($params{page}, $params{destpage}, $page).

                                "</span>\n";
                }
                $res .= "</div>\n";
                                "</span>\n";
                }
                $res .= "</div>\n";