diff options
| author | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-28 05:26:49 +0000 |
|---|---|---|
| committer | joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071> | 2006-07-28 05:26:49 +0000 |
| commit | 409e62021c5c05e0184a61d0692697c10a0b8283 (patch) | |
| tree | b745279c2c83aee71c279692d680dd997c360f45 /IkiWiki | |
| parent | 51d20d72f63b6f633747421c7afde171e189f50d (diff) | |
| download | ikiwiki-409e62021c5c05e0184a61d0692697c10a0b8283.tar ikiwiki-409e62021c5c05e0184a61d0692697c10a0b8283.tar.gz | |
* Add getopt hook type, this allows plugins to add new command-line options.
* Add --tagbase option to tag plugin.
Diffstat (limited to 'IkiWiki')
| -rw-r--r-- | IkiWiki/Plugin/skeleton.pm | 6 | ||||
| -rw-r--r-- | IkiWiki/Plugin/tag.pm | 11 | ||||
| -rw-r--r-- | IkiWiki/Setup/Standard.pm | 1 |
3 files changed, 18 insertions, 0 deletions
diff --git a/IkiWiki/Plugin/skeleton.pm b/IkiWiki/Plugin/skeleton.pm index acbc88994..27da50e6f 100644 --- a/IkiWiki/Plugin/skeleton.pm +++ b/IkiWiki/Plugin/skeleton.pm @@ -9,6 +9,8 @@ use strict; use IkiWiki; sub import { #{{{ + IkiWiki::hook(type => "getopt", id => "skeleton", + call => \&getopt); IkiWiki::hook(type => "checkconfig", id => "skeleton", call => \&checkconfig); IkiWiki::hook(type => "preprocess", id => "skeleton", @@ -29,6 +31,10 @@ sub import { #{{{ call => \&cgi); } # }}} +sub getopt () { #{{{ + IkiWiki::debug("skeleton plugin getopt"); +} #}}} + sub checkconfig () { #{{{ IkiWiki::debug("skeleton plugin checkconfig"); } #}}} diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index c4e12e61d..56bf17e2c 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -9,12 +9,20 @@ use IkiWiki; my %tags; sub import { #{{{ + IkiWiki::hook(type => "getopt", id => "tag", + call => \&getopt); IkiWiki::hook(type => "preprocess", id => "tag", call => \&preprocess); IkiWiki::hook(type => "pagetemplate", id => "tag", call => \&pagetemplate); } # }}} +sub getopt () { #{{{ + eval q{use Getopt::Long}; + Getopt::Long::Configure('pass_through'); + GetOptions("tagbase=s" => \$IkiWiki::config{tagbase}); +} #}}} + sub preprocess (@) { #{{{ if (! @_) { return ""; @@ -26,6 +34,9 @@ sub preprocess (@) { #{{{ $tags{$page} = []; foreach my $tag (keys %params) { + if (exists $IkiWiki::config{tagbase}) { + $tag=$IkiWiki::config{tagbase}."/".$tag; + } push @{$tags{$page}}, $tag; # hidden WikiLink push @{$IkiWiki::links{$page}}, $tag; diff --git a/IkiWiki/Setup/Standard.pm b/IkiWiki/Setup/Standard.pm index 25f038a06..4082ca7af 100644 --- a/IkiWiki/Setup/Standard.pm +++ b/IkiWiki/Setup/Standard.pm @@ -64,6 +64,7 @@ sub setup_standard { debug("refreshing wiki.."); } + loadplugins(); checkconfig(); lockwiki(); loadindex(); |