diff options
| -rw-r--r-- | IkiWiki/Plugin/pagestats.pm | 13 | ||||
| -rw-r--r-- | IkiWiki/Render.pm | 10 | ||||
| -rw-r--r-- | doc/ikiwiki/directive/pagestats.mdwn | 10 |
3 files changed, 30 insertions, 3 deletions
diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm index 8ab5d3666..874ead7e6 100644 --- 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}); + 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; - $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; } @@ -63,6 +72,8 @@ sub preprocess (@) { my $res = "<div class='pagecloud'>\n"; foreach my $page (sort keys %counts) { + next unless $counts{$page} > 0; + my $class = $classes[$counts{$page} * scalar(@classes) / ($max + 1)]; $res .= "<span class=\"$class\">". htmllink($params{page}, $params{destpage}, $page). diff --git a/IkiWiki/Render.pm b/IkiWiki/Render.pm index bed9cb777..5cb67ea07 100644 --- a/IkiWiki/Render.pm +++ b/IkiWiki/Render.pm @@ -24,13 +24,19 @@ sub calculate_backlinks () { $backlinks_calculated=1; } -sub backlinks ($) { +sub backlink_pages ($) { my $page=shift; calculate_backlinks(); + return keys %{$backlinks{$page}}; +} + +sub backlinks ($) { + my $page=shift; + my @links; - foreach my $p (keys %{$backlinks{$page}}) { + foreach my $p (backlink_pages($page)) { my $href=urlto($p, $page); # Trim common dir prefixes from both pages. diff --git a/doc/ikiwiki/directive/pagestats.mdwn b/doc/ikiwiki/directive/pagestats.mdwn index cfb5737a5..426f3e4af 100644 --- 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"]] +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"]] |