md5 can't handle wide chars

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 957fd986d69a83496eddced3be5e495f85760477..2aa70d4068a81e769dd0a1491d4f9dc50873b8bc 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -9,12 +9,31 @@ use IkiWiki;
 my %tags;
 
 sub import { #{{{
 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);
 } # }}}
 
        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 "";


@@ -28,7 +47,7 @@ sub preprocess (@) { #{{{
        foreach my $tag (keys %params) {
                push @{$tags{$page}}, $tag;
                # hidden WikiLink
        foreach my $tag (keys %params) {
                push @{$tags{$page}}, $tag;
                # hidden WikiLink

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

        }
                
        return "";
        }
                
        return "";


@@ -40,10 +59,27 @@ sub pagetemplate (@) { #{{{
        my $destpage=$params{destpage};
        my $template=$params{template};
 
        my $destpage=$params{destpage};
        my $template=$params{template};
 

-       $template->param(tags => join(', ', 
-                       map { IkiWiki::htmllink($page, $destpage, $_) } 
-                               @{$tags{$page}}))
-               if exists $tags{$page} && $template->query(name => "tags");
+       $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 => "items")) {
+               # It's an rss template. Modify each item in the feed,
+               # adding any categories based on the page for that item.
+               foreach my $item (@{$template->param("items")}) {
+                       my $p=$item->{page};
+                       if (exists $tags{$p} && @{$tags{$p}}) {
+                               $item->{categories}=[];
+                               foreach my $tag (@{$tags{$p}}) {
+                                       push @{$item->{categories}}, {
+                                               category => $tag,
+                                       };
+                               }
+                       }
+               }
+       }

 } # }}}
 
 1
 } # }}}
 
 1