rework dependency types code

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

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index a143f24d089d3ff0d405fd0c6f1544558375600c..80561350b5fe44d7d282fb5fac6b5c9ac8e295ea 100644 (file)
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -23,16 +23,17 @@ sub preprocess (@) {
        $params{pages}="*" unless defined $params{pages};
        
        # Needs to update count whenever a page is added or removed, so
        $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});
+       # register a presence dependency.
+       add_depends($params{page}, $params{pages}, presence => 1);

        
        

-       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;

        }
        }

-       return $count;
+       else {
+               @pages=pagespec_match_list([keys %pagesources], $params{pages}, location => $params{page});
+       }
+       return $#pages+1;

 }
 
 1
 }
 
 1