Merge branch 'aggregateinternal'

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

diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index 56dc03cef98ad67c0e979397189185c1c2c8708c..4faef7be197a8b20362132521ae67de2976a3ad8 100644 (file)
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -12,12 +12,22 @@ sub import { #{{{
 sub preprocess (@) { #{{{
        my %params=@_;
        
 sub preprocess (@) { #{{{
        my %params=@_;
        

+       foreach my $param (qw{match pagespec}) {
+               if (! exists $params{$param}) {
+                       error sprintf(gettext("%s parameter is required"), $param);
+               }
+       }
+

        add_depends($params{page}, $params{pagespec});
        
        my $ret=pagespec_match($params{match}, $params{pagespec}, 
                        location => $params{page});
        add_depends($params{page}, $params{pagespec});
        
        my $ret=pagespec_match($params{match}, $params{pagespec}, 
                        location => $params{page});

-       return $ret if ! $ret;
-       return "the pagespec matches";
+       if ($ret) {
+               return "match: $ret";
+       }
+       else {
+               return "no match: $ret";
+       }

 } # }}}
 
 1
 } # }}}
 
 1