Merge remote branch 'smcv/unescaped-meta'

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

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index cd0bdb08520e14f02c26a4be01bd4b558e0b0539..1c0b46830163da3872a0e4b62f0db4960ca3605c 100644 (file)
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -27,6 +27,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
 }
 
                },
 }
 


@@ -35,31 +36,44 @@ sub preprocess (@) {
        $params{pages}="*" unless defined $params{pages};
        my $style = ($params{style} or 'cloud');
        
        $params{pages}="*" unless defined $params{pages};
        my $style = ($params{style} or 'cloud');
        

-       # Needs to update whenever a page is added or removed.
-       add_depends($params{page}, $params{pages}, deptype("presence"));
-       # Also needs to update when any page with links changes, 
-       # in case the links point to our displayed pages.
-       # (Among limits this further.)
-       add_depends($params{page}, exists $params{among} ? $params{among} : "*",
-               deptype("links")); 
-       

        my %counts;
        my $max = 0;
        my %counts;
        my $max = 0;

-       foreach my $page (pagespec_match_list([keys %pagesources],
-                       $params{pages}, location => $params{page})) {
+       foreach my $page (pagespec_match_list($params{page}, $params{pages},
+                                 # update when a displayed page is added/removed
+                                 deptype => deptype("presence"))) {

                use IkiWiki::Render;
 
                my @backlinks = IkiWiki::backlink_pages($page);
 
                if (exists $params{among}) {
                use IkiWiki::Render;
 
                my @backlinks = IkiWiki::backlink_pages($page);
 
                if (exists $params{among}) {

-                       @backlinks = pagespec_match_list(\@backlinks,
-                               $params{among}, location => $params{page});
+                       # only consider backlinks from the amoung pages
+                       @backlinks = pagespec_match_list(
+                               $params{page}, $params{among},
+                               # update whenever links on those pages change
+                               deptype => deptype("links"),
+                               list => \@backlinks
+                       );
+               }
+               else {
+                       # update when any page with links changes,
+                       # in case the links point to our displayed pages
+                       add_depends($params{page}, "*", deptype("links"));

                }
 
                $counts{$page} = scalar(@backlinks);
                $max = $counts{$page} if $counts{$page} > $max;
        }
 
                }
 
                $counts{$page} = scalar(@backlinks);
                $max = $counts{$page} if $counts{$page} > $max;
        }
 

+       if (exists $params{show}) {
+               my $i=0;
+               my %show;
+               foreach my $key (sort { $counts{$b} <=> $counts{$a} } keys %counts) {
+                       last if ++$i > $params{show};
+                       $show{$key}=$counts{$key};
+               }
+               %counts=%show;
+       }
+

        if ($style eq 'table') {
                return "<table class='pageStats'>\n".
                        join("\n", map {
        if ($style eq 'table') {
                return "<table class='pageStats'>\n".
                        join("\n", map {