X-Git-Url: https://scripts.mit.edu/gitweb/www/ikiwiki.git/blobdiff_plain/d76c73eb8634f3181bd246d747ae42443d4b6d31..b6b7dc3a43266515822c31b177bfd26e8d59f359:/IkiWiki/Plugin/pagestats.pm

diff --git a/IkiWiki/Plugin/pagestats.pm b/IkiWiki/Plugin/pagestats.pm
index 34fd11715..afe4eeaf2 100644
--- a/IkiWiki/Plugin/pagestats.pm
+++ b/IkiWiki/Plugin/pagestats.pm
@@ -7,58 +7,85 @@
 #          (default)
 #   table: produces a table with the number of backlinks for each page
 #
-# By Enrico Zini.
+# by Enrico Zini
 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 { #{{{
-	IkiWiki::hook(type => "preprocess", id => "pagestats",
-		call => \&preprocess);
-} # }}}
+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.
-	IkiWiki::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 (%IkiWiki::links) {
-		if (IkiWiki::globlist_match($page, $params{pages})) {
-			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>$_</td><td>".$counts{$_}."</td></tr>" }
-		      sort { $counts{$b} <=> $counts{$a} } keys %counts)."\n</table>\n" ;
-	} else {
+		return "<table class='pageStats'>\n".
+			join("\n", map {
+				"<tr><td>".
+				htmllink($params{page}, $params{destpage}, $_, noimageinline => 1).
+				"</td><td>".$counts{$_}."</td></tr>"
+			}
+			sort { $counts{$b} <=> $counts{$a} } keys %counts).
+			"\n</table>\n" ;
+	}
+	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)];
-			my $link = IkiWiki::abs2rel(IkiWiki::htmlpage($page), IkiWiki::dirname($params{page}));
-			$res .= sprintf("<span class='%s'><a href='%s'>%s</a></span>\n",
-					$class, $link, $page);
-				
+			$res .= "<span class=\"$class\">".
+			        htmllink($params{page}, $params{destpage}, $page).
+			        "</span>\n";
 		}
 		$res .= "</div>\n";
 
 		return $res;
 	}
-} # }}}
+}
 
 1