X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/ee1ad53c4c2710aa7ded61bdc56f3a8cce514f22..5bdcd4d57b2ca5dbf6e3d46a693cec4d27512020:/IkiWiki/Plugin/pagecount.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 2c20ca195..5a2301af4 100644
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -3,13 +3,22 @@ package IkiWiki::Plugin::pagecount;
 
 use warnings;
 use strict;
-use IkiWiki 2.00;
+use IkiWiki 3.00;
 
-sub import { #{{{
+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};
 	
@@ -17,13 +26,14 @@ sub preprocess (@) { #{{{
 	# register a dependency.
 	add_depends($params{page}, $params{pages});
 	
-	my @pages=keys %pagesources;
-	return $#pages+1 if $params{pages} eq "*"; # optimisation
-	my $count=0;
-	foreach my $page (@pages) {
-		$count++ if pagespec_match($page, $params{pages}, location => $params{page});
+	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