web commit by http://cstork.myopenid.com/

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

diff --git a/IkiWiki/Plugin/pagecount.pm b/IkiWiki/Plugin/pagecount.pm
index cfc962b6c4df0172fca409033326b3153602fc3f..2c20ca195dcd1f55ff4cdbe9ad70fed642c236af 100644 (file)
--- a/IkiWiki/Plugin/pagecount.pm
+++ b/IkiWiki/Plugin/pagecount.pm
@@ -1,14 +1,12 @@
 #!/usr/bin/perl
 #!/usr/bin/perl

-# Provides [[pagecount ]] to count the number of pages.

 package IkiWiki::Plugin::pagecount;
 
 use warnings;
 use strict;
 package IkiWiki::Plugin::pagecount;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::hook(type => "preprocess", id => "pagecount", 
-               call => \&preprocess);
+       hook(type => "preprocess", id => "pagecount", call => \&preprocess);

 } # }}}
 
 sub preprocess (@) { #{{{
 } # }}}
 
 sub preprocess (@) { #{{{


@@ -17,13 +15,13 @@ sub preprocess (@) { #{{{
        
        # Needs to update count whenever a page is added or removed, so
        # register a dependency.
        
        # 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;
+       my @pages=keys %pagesources;

        return $#pages+1 if $params{pages} eq "*"; # optimisation
        my $count=0;
        foreach my $page (@pages) {
        return $#pages+1 if $params{pages} eq "*"; # optimisation
        my $count=0;
        foreach my $page (@pages) {

-               $count++ if IkiWiki::pagespec_match($page, $params{pages});
+               $count++ if pagespec_match($page, $params{pages}, location => $params{page});

        }
        return $count;
 } # }}}
        }
        return $count;
 } # }}}