X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/bb93fccf0690344aa77f9538a508959a6de09847..f7601954a862afd4c5a5b9ba83480af0472e1cf9:/IkiWiki/Plugin/pagestats.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index e20d0dac6..874ead7e6 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -12,7 +12,7 @@ package IkiWiki::Plugin::pagestats;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
 # Names of the HTML classes to use for the tag cloud
 our @classes = ('smallestPC', 'smallPC', 'normalPC', 'bigPC', 'biggestPC' );
@@ -38,15 +38,23 @@ 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 (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;
+	foreach my $page (pagespec_match_list([keys %links],
+			$params{pages}, location => $params{page})) {
+		use IkiWiki::Render;
+
+		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;
 	}
 
 	if ($style eq 'table') {
@@ -64,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).