unfuzzy

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 2aa70d4068a81e769dd0a1491d4f9dc50873b8bc..ddb67c2a8b5ad52f24c76cd1ff512c27466232e4 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -9,26 +9,24 @@ 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);
+       hook(type => "getopt", id => "tag", call => \&getopt);
+       hook(type => "preprocess", id => "tag", call => \&preprocess, scan => 1);
+       hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
 } # }}}
 
 sub getopt () { #{{{
        eval q{use Getopt::Long};
+       error($@) if $@;
        Getopt::Long::Configure('pass_through');
-       GetOptions("tagbase=s" => \$IkiWiki::config{tagbase});
+       GetOptions("tagbase=s" => \$config{tagbase});
 } #}}}
 
 sub tagpage ($) { #{{{
        my $tag=shift;
                        
-       if (exists $IkiWiki::config{tagbase} &&
-           defined $IkiWiki::config{tagbase}) {
-               $tag=$IkiWiki::config{tagbase}."/".$tag;
+       if (exists $config{tagbase} &&
+           defined $config{tagbase}) {
+               $tag=$config{tagbase}."/".$tag;
        }
 
        return $tag;
@@ -47,7 +45,7 @@ sub preprocess (@) { #{{{
        foreach my $tag (keys %params) {
                push @{$tags{$page}}, $tag;
                # hidden WikiLink
-               push @{$IkiWiki::links{$page}}, tagpage($tag);
+               push @{$links{$page}}, tagpage($tag);
        }
                
        return "";
@@ -61,23 +59,14 @@ sub pagetemplate (@) { #{{{
 
        $template->param(tags => [
                map { 
-                       link => IkiWiki::htmllink($page, $destpage, tagpage($_))
+                       link => 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,
-                                       };
-                               }
-                       }
+       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}}]);
                }
        }
 } # }}}