X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/2794d7ef5abc4fa8fc2eb42d5c85ada197df0767..dad25308d2832de28d3b8151aacc3b124575733c:/IkiWiki/Plugin/pagecount.pm

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index cfc962b6c..5a2301af4 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -1,31 +1,39 @@
 #!/usr/bin/perl
-# Provides [[pagecount ]] to count the number of pages.
 package IkiWiki::Plugin::pagecount;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 
-sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "pagecount", 
-		call => \&preprocess);
-} # }}}
+sub import {
+	hook(type => "getsetup", id => "pagecount", call => \&getsetup);
+	hook(type => "preprocess", id => "pagecount", call => \&preprocess);
+}
 
-sub preprocess (@) { #{{{
+sub getsetup () {
+	return 
+		plugin => {
+			safe => 1,
+			rebuild => undef,
+		},
+}
+
+sub preprocess (@) {
 	my %params=@_;
 	$params{pages}="*" unless defined $params{pages};
 	
 	# Needs to update count whenever a page is added or removed, so
 	# register a dependency.
-	IkiWiki::add_depends($params{page}, $params{pages});
+	add_depends($params{page}, $params{pages});
 	
-	my @pages=keys %IkiWiki::pagesources;
-	return $#pages+1 if $params{pages} eq "*"; # optimisation
-	my $count=0;
-	foreach my $page (@pages) {
-		$count++ if IkiWiki::pagespec_match($page, $params{pages});
+	my @pages;
+	if ($params{pages} eq "*") {
+		@pages=keys %pagesources;
+	}
+	else {
+		@pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page});
 	}
-	return $count;
-} # }}}
+	return $#pages+1;
+}
 
 1