From: Joey Hess <joey@gnu.kitenet.net>
Date: Fri, 9 Oct 2009 16:48:16 +0000 (-0400)
Subject: progress: switch to new pagespec_match_list
X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/commitdiff_plain/96682e3084993428f4de384f5087cffdc29f1710

progress: switch to new pagespec_match_list
---

diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 6da3e4f71..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}, deptype("presence"));
-		add_depends($params{page}, $params{donepages}, deptype("presence"));
-
-		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%";