* Add getopt hook type, this allows plugins to add new command-line options.

[ikiwiki.git] / IkiWiki / Plugin / tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index a6eddb019a51606bd6d92fa2927b4a5861d1b3ae..56bf17e2c1042ae367c1cd9afa63012ff33723ab 100644 (file)
--- 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 "";
@@ -22,9 +30,13 @@ sub preprocess (@) { #{{{
        my %params=@_;
        my $page = $params{page};
        delete $params{page};
+       delete $params{destpage};
 
        $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;
@@ -33,14 +45,16 @@ sub preprocess (@) { #{{{
        return "";
 } # }}}
 
-sub pagetemplate ($$) { #{{{
-       my $page=shift;
-       my $template=shift;
-
-       $template->param(tags => join(', ', 
-                       map { IkiWiki::htmllink($page, $page, $_) } 
-                               @{$tags{$page}}))
-               if exists $tags{$page} && $template->query(name => "tags");
+sub pagetemplate (@) { #{{{
+       my %params=@_;
+       my $page=$params{page};
+       my $destpage=$params{destpage};
+       my $template=$params{template};
+
+       $template->param(tags => [
+               map { link => IkiWiki::htmllink($page, $destpage, $_) }, 
+                       @{$tags{$page}}
+       ]) if exists $tags{$page} && @{$tags{$page}} && $template->query(name => "tags");
 } # }}}
 
 1