Merge commit 'upstream/master' into prv/po

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

diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index 56dc03cef98ad67c0e979397189185c1c2c8708c..9f9b50f017bb5cb75a5ed1155984531d082d200d 100644 (file)
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -6,18 +6,37 @@ use strict;
 use IkiWiki 2.00;
 
 sub import { #{{{
 use IkiWiki 2.00;
 
 sub import { #{{{

+       hook(type => "getsetup", id => "testpagespec", call => \&getsetup);

        hook(type => "preprocess", id => "testpagespec", call => \&preprocess);
 } # }}}
 
        hook(type => "preprocess", id => "testpagespec", call => \&preprocess);
 } # }}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+} #}}}
+

 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