diff options
| author | Joey Hess <joey@gnu.kitenet.net> | 2009-10-13 15:15:54 -0400 |
|---|---|---|
| committer | Joey Hess <joey@gnu.kitenet.net> | 2009-10-13 15:15:54 -0400 |
| commit | ef7bddbc3693d7abf227100a9a9bc21d186dfada (patch) | |
| tree | 1072bb7d7c29375b9008b3021bc1d2049eeaecca /IkiWiki/Plugin/progress.pm | |
| parent | f6402d22caeecf481826b60791d84cb53210f686 (diff) | |
| parent | 046ac5fec5534e10b8e34b96014f936bb151d147 (diff) | |
Merge branch 'dependency-types'
Conflicts:
doc/todo/dependency_types.mdwn
Diffstat (limited to 'IkiWiki/Plugin/progress.pm')
| -rw-r--r-- | IkiWiki/Plugin/progress.pm | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm index 76d994acc..fe64b40b1 100644 --- a/IkiWiki/Plugin/progress.pm +++ b/IkiWiki/Plugin/progress.pm @@ -36,16 +36,12 @@ sub preprocess (@) { $fill.="%"; } elsif (defined $params{totalpages} and defined $params{donepages}) { - add_depends($params{page}, $params{totalpages}); - add_depends($params{page}, $params{donepages}); - - my @pages=keys %pagesources; - my $totalcount=0; - my $donecount=0; - foreach my $page (@pages) { - $totalcount++ if pagespec_match($page, $params{totalpages}, location => $params{page}); - $donecount++ if pagespec_match($page, $params{donepages}, location => $params{page}); - } + my $totalcount=pagespec_match_list( + $params{page}, $params{totalpages}, + deptype => deptype("presence")); + my $donecount=pagespec_match_list( + $params{page}, $params{donepages}, + deptype => deptype("presence")); if ($totalcount == 0) { $fill = "100%"; |