Merge branch 'master' of ssh://git.ikiwiki.info

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

diff --git a/IkiWiki/Plugin/testpagespec.pm b/IkiWiki/Plugin/testpagespec.pm
index 56dc03cef98ad67c0e979397189185c1c2c8708c..440fca33be02cc6cf91ff9072c725d936571b334 100644 (file)
--- a/IkiWiki/Plugin/testpagespec.pm
+++ b/IkiWiki/Plugin/testpagespec.pm
@@ -3,21 +3,40 @@ package IkiWiki::Plugin::testpagespec;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki 2.00;
+use IkiWiki 3.00;

 
 

-sub import { #{{{
+sub import {
+       hook(type => "getsetup", id => "testpagespec", call => \&getsetup);

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

-} # }}}
+}

 
 

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

        my %params=@_;
        
        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