* Generalised preprocesser loop protection code.

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 841d508bfcc33d87b8a7940a3ecd76ddb8f24d65..3de09a7672641ec471eb147038fd6a9672a3e0e3 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -6,12 +6,34 @@ use warnings;
 use strict;
 use IkiWiki;
 
 use strict;
 use IkiWiki;
 

-my %tag;
+my %tags;

 
 sub import { #{{{
 
 sub import { #{{{

-       IkiWiki::hook(type => "preprocess", id => "tag", call => \&preprocess);
+       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 tagpage ($) { #{{{
+       my $tag=shift;
+                       
+       if (exists $IkiWiki::config{tagbase} &&
+           defined $IkiWiki::config{tagbase}) {
+               $tag=$IkiWiki::config{tagbase}."/".$tag;
+       }
+
+       return $tag;
+} #}}}
+

 sub preprocess (@) { #{{{
        if (! @_) {
                return "";
 sub preprocess (@) { #{{{
        if (! @_) {
                return "";


@@ -19,13 +41,36 @@ sub preprocess (@) { #{{{
        my %params=@_;
        my $page = $params{page};
        delete $params{page};
        my %params=@_;
        my $page = $params{page};
        delete $params{page};

+       delete $params{destpage};

 
 

+       $tags{$page} = [];

        foreach my $tag (keys %params) {
        foreach my $tag (keys %params) {

+               push @{$tags{$page}}, $tag;

                # hidden WikiLink
                # hidden WikiLink

-               push @{$IkiWiki::links{$page}}, $tag;
+               push @{$IkiWiki::links{$page}}, tagpage($tag);

        }
                
        return "";
 } # }}}
 
        }
                
        return "";
 } # }}}
 

+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, tagpage($_))
+               }, @{$tags{$page}}
+       ]) if exists $tags{$page} && @{$tags{$page}} && $template->query(name => "tags");
+
+       if ($template->query(name => "pubdate")) {
+               # It's an rss template. Add any categories.
+               if (exists $tags{$page} && @{$tags{$page}}) {
+                       $template->param(categories => [map { category => $_ }, @{$tags{$page}}]);
+               }
+       }
+} # }}}
+

 1
 1