(no commit message)

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

diff --git a/IkiWiki/Plugin/progress.pm b/IkiWiki/Plugin/progress.pm
index 75da16d16de80e72b14b76dc2a11d63fe84c88f3..d27df5ca894b3aacf77fb441901fb5e47cf359b9 100644 (file)
--- a/IkiWiki/Plugin/progress.pm
+++ b/IkiWiki/Plugin/progress.pm
@@ -3,7 +3,7 @@ package IkiWiki::Plugin::progress;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 my $percentage_pattern = qr/[0-9]+\%?/; # pattern to validate percentages
 
 
 my $percentage_pattern = qr/[0-9]+\%?/; # pattern to validate percentages
 


@@ -18,6 +18,7 @@ sub getsetup () {
                plugin => {
                        safe => 1,
                        rebuild => undef,
                plugin => {
                        safe => 1,
                        rebuild => undef,

+                       section => "widget",

                },
 }
 
                },
 }
 


@@ -36,16 +37,12 @@ sub preprocess (@) {
                $fill.="%";
        }
        elsif (defined $params{totalpages} and defined $params{donepages}) {
                $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%";
                
                if ($totalcount == 0) {
                        $fill = "100%";