X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/58141a0ebcdf3313a83af712b83f8acd1c08aa3b..f2b3d1341447cbf29189ab490daae418fbe5d02d:/IkiWiki/Plugin/pagestats.pm

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index f9a54ab56..afe4eeaf2 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -12,49 +12,71 @@ package IkiWiki::Plugin::pagestats;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 
 # Names of the HTML classes to use for the tag cloud
 our @classes = ('smallestPC', 'smallPC', 'normalPC', 'bigPC', 'biggestPC' );
 
-sub import { #{{{
+sub import {
+	hook(type => "getsetup", id => "pagestats", call => \&getsetup);
 	hook(type => "preprocess", id => "pagestats", call => \&preprocess);
-} # }}}
+}
 
-sub preprocess (@) { #{{{
+sub getsetup () {
+	return 
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	my $style = ($params{style} or 'cloud');
 	
-	# 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.
+	add_depends($params{page}, $params{pages}, exists => 1);
+	# 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} : "*",
+		links => 1); 
 	
 	my %counts;
 	my $max = 0;
-	foreach my $page (keys %links) {
-		if (pagespec_match($page, $params{pages}, $params{page})) {
-			use IkiWiki::Render;
-			my @bl = IkiWiki::backlinks($page);
-			$counts{$page} = scalar(@bl);
-			$max = $counts{$page} if $counts{$page} > $max;
+	foreach my $page (pagespec_match_list([keys %pagesources],
+			$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') {
 		return "<table class='pageStats'>\n".
 			join("\n", map {
 				"<tr><td>".
-				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).
 			"\n</table>\n" ;
-	} else {
+	}
+	else {
 		# In case of misspelling, default to a page cloud
 
 		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).
@@ -64,6 +86,6 @@ sub preprocess (@) { #{{{
 
 		return $res;
 	}
-} # }}}
+}
 
 1