pagecount: switched to use_pagespec

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 419f2d535ec6fbe5cb32a8a09173bfd4378bc827..40474b2a1c4b1e05bfac394075339a2d37f7c82a 100644 (file)
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -20,20 +20,20 @@ sub getsetup () {
 
 sub preprocess (@) {
        my %params=@_;
 
 sub preprocess (@) {
        my %params=@_;

-       $params{pages}="*" unless defined $params{pages};
+       my $pages=defined $params{pages} ? $params{pages} : "*";

        
        

-       # Needs to update count whenever a page is added or removed, so
-       # register a presence dependency.
-       add_depends($params{page}, $params{pages}, deptype("presence"));
-       
-       my @pages;
-       if ($params{pages} eq "*") {
-               @pages=keys %pagesources;
-       }
-       else {
-               @pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page});
+       # Just get a list of all the pages, and count the items in it.
+       # Use a presence dependency to only update when pages are added
+       # or removed.
+
+       if ($pages eq '*') {
+               # optimisation to avoid needing to try matching every page
+               add_depends($params{page}, $pages, deptype("presence"));
+               return scalar keys %pagesources;

        }
        }

-       return $#pages+1;
+
+       return scalar use_pagespec($params{page}, $pages,
+               deptype => deptype("presence"));

 }
 
 1
 }
 
 1