]> sipb.mit.edu Git - ikiwiki.git/commitdiff
pagestate: switch to use_pagespec
authorJoey Hess <joey@gnu.kitenet.net>
Thu, 8 Oct 2009 23:27:25 +0000 (19:27 -0400)
committerJoey Hess <joey@gnu.kitenet.net>
Fri, 9 Oct 2009 00:29:51 +0000 (20:29 -0400)
IkiWiki/Plugin/pagestats.pm

index cd0bdb08520e14f02c26a4be01bd4b558e0b0539..e64f7d9c38869ae1baf5734101f8afe705f90e9f 100644 (file)
@@ -35,25 +35,27 @@ sub preprocess (@) {
        $params{pages}="*" unless defined $params{pages};
        my $style = ($params{style} or 'cloud');
        
-       # Needs to update whenever a page is added or removed.
-       add_depends($params{page}, $params{pages}, deptype("presence"));
-       # Also needs to update when any page with links changes, 
-       # in case the links point to our displayed pages.
-       # (Among limits this further.)
-       add_depends($params{page}, exists $params{among} ? $params{among} : "*",
-               deptype("links")); 
-       
        my %counts;
        my $max = 0;
-       foreach my $page (pagespec_match_list([keys %pagesources],
-                       $params{pages}, location => $params{page})) {
+       foreach my $page (use_pagespec($params{page}, $params{pages},
+                         # update when a displayed page is added or removed
+                         deptype => deptype("presence"))) {
                use IkiWiki::Render;
 
                my @backlinks = IkiWiki::backlink_pages($page);
 
                if (exists $params{among}) {
-                       @backlinks = pagespec_match_list(\@backlinks,
-                               $params{among}, location => $params{page});
+                       # only consider backlinks from the amoung pages
+                       @backlinks = use_pagespec($params{page}, $params{among},
+                               # update whenever links on those pages change
+                               deptype => deptype("links"),
+                               list => \@backlinks
+                       );
+               }
+               else {
+                       # update when any page with links changes,
+                       # in case the links point to our displayed pages
+                       add_depends($params{page}, "*", deptype("links"));
                }
 
                $counts{$page} = scalar(@backlinks);