pagestats: add `among` parameter, which only counts links from specified pages

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 5dd2f337b4bc1b8822e097f3fcef714ee3c1ac42..874ead7e6de669c1d33c66b74984ef90504f9b8e 100644 (file)
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -38,13 +38,22 @@ sub preprocess (@) {
        # Needs to update whenever a page is added or removed, so
        # register a dependency.
        add_depends($params{page}, $params{pages});
        # Needs to update whenever a page is added or removed, so
        # register a dependency.
        add_depends($params{page}, $params{pages});

+       add_depends($params{page}, $params{among}) if exists $params{among};

        
        my %counts;
        my $max = 0;
        foreach my $page (pagespec_match_list([keys %links],
                        $params{pages}, location => $params{page})) {
                use IkiWiki::Render;
        
        my %counts;
        my $max = 0;
        foreach my $page (pagespec_match_list([keys %links],
                        $params{pages}, location => $params{page})) {
                use IkiWiki::Render;

-               $counts{$page} = scalar(IkiWiki::backlinks($page));
+
+               my @backlinks = IkiWiki::backlink_pages($page);
+
+               if (exists $params{among}) {
+                       @backlinks = pagespec_match_list(\@backlinks,
+                               $params{among}, location => $params{page});
+               }
+
+               $counts{$page} = scalar(@backlinks);

                $max = $counts{$page} if $counts{$page} > $max;
        }
 
                $max = $counts{$page} if $counts{$page} > $max;
        }
 

diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn
index cfb5737a565898bbb31babcfbee8155df38c7ead..426f3e4afdf6aeda4fb782812555ead457b3a3e1 100644 (file)
--- a/doc/ikiwiki/directive/pagestats.mdwn
+++ b/doc/ikiwiki/directive/pagestats.mdwn
@@ -12,4 +12,14 @@ And here's how to create a table of all the pages on the wiki:
 
        \[[!pagestats style="table"]]
 
 
        \[[!pagestats style="table"]]
 

+The optional `among` parameter limits counting to pages that match a
+[[ikiwiki/PageSpec]]. For instance, to display a cloud of tags used on blog
+entries, you could use:
+
+       \[[!pagestats pages="tags/*" among="blog/posts/*"]]
+
+or to display a cloud of tags related to Linux, you could use:
+
+       \[[!pagestats pages="tags/* and not tags/linux" among="tagged(linux)"]]
+

 [[!meta robots="noindex, follow"]]
 [[!meta robots="noindex, follow"]]