web commit by hb

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

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index a1b4c1d45b59ed7df414765012ddaead887a1030..f6398c535f29ce2768e7389bf4d8b7581407d61a 100644 (file)
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -7,19 +7,18 @@
 #          (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 => "preprocess", id => "pagestats", call => \&preprocess);

 } # }}}
 
 sub preprocess (@) { #{{{
 } # }}}
 
 sub preprocess (@) { #{{{


@@ -29,12 +28,13 @@ 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 (keys %IkiWiki::links) {
-               if (IkiWiki::globlist_match($page, $params{pages})) {
+       foreach my $page (keys %links) {
+               if (pagespec_match($page, $params{pages}, location => $params{page})) {
+                       use IkiWiki::Render;

                        my @bl = IkiWiki::backlinks($page);
                        $counts{$page} = scalar(@bl);
                        $max = $counts{$page} if $counts{$page} > $max;
                        my @bl = IkiWiki::backlinks($page);
                        $counts{$page} = scalar(@bl);
                        $max = $counts{$page} if $counts{$page} > $max;


@@ -45,7 +45,7 @@ sub preprocess (@) { #{{{
                return "<table class='pageStats'>\n".
                        join("\n", map {
                                "<tr><td>".
                return "<table class='pageStats'>\n".
                        join("\n", map {
                                "<tr><td>".

-                               IkiWiki::htmllink($params{page}, $params{destpage}, $_, 1).
+                               htmllink($params{page}, $params{destpage}, $_, noimageinline => 1).

                                "</td><td>".$counts{$_}."</td></tr>"
                        }
                        sort { $counts{$b} <=> $counts{$a} } keys %counts).
                                "</td><td>".$counts{$_}."</td></tr>"
                        }
                        sort { $counts{$b} <=> $counts{$a} } keys %counts).


@@ -57,7 +57,7 @@ sub preprocess (@) { #{{{
                foreach my $page (sort keys %counts) {
                        my $class = $classes[$counts{$page} * scalar(@classes) / ($max + 1)];
                        $res .= "<span class=\"$class\">".
                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";