fix logic error

[git.ikiwiki.info.git] / IkiWiki / Plugin / pagecount.pm

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index 313ffdff0d6e9c225957d692fbfdea6a9f3109a3..8d36f057eb0820a62c9704988d66fde75ccf6c4b 100644 (file)
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -3,27 +3,37 @@ package IkiWiki::Plugin::pagecount;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "pagecount", call => \&getsetup);

        hook(type => "preprocess", id => "pagecount", call => \&preprocess);
        hook(type => "preprocess", id => "pagecount", call => \&preprocess);

-} # }}}
+}

 
 

-sub preprocess (@) { #{{{
+sub getsetup () {
+       return 
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+}
+
+sub preprocess (@) {

        my %params=@_;
        my %params=@_;

-       $params{pages}="*" unless defined $params{pages};
-       
-       # Needs to update count whenever a page is added or removed, so
-       # register a dependency.
-       add_depends($params{page}, $params{pages});
+       my $pages=defined $params{pages} ? $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}, $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 $count;
-} # }}}
+
+       return scalar pagespec_match_list($params{page}, $pages,
+               deptype => deptype("presence"));
+}

 
 1
 
 1