* Add a destpage parameter to the filter hook.

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 3de09a7672641ec471eb147038fd6a9672a3e0e3..48ed1a8f87eb67ae74302484d49942a468a7a7f4 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,31 +4,29 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 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);
+       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};
 } # }}}
 
 sub getopt () { #{{{
        eval q{use Getopt::Long};

+       error($@) if $@;

        Getopt::Long::Configure('pass_through');
        Getopt::Long::Configure('pass_through');

-       GetOptions("tagbase=s" => \$IkiWiki::config{tagbase});
+       GetOptions("tagbase=s" => \$config{tagbase});

 } #}}}
 
 sub tagpage ($) { #{{{
        my $tag=shift;
                        
 } #}}}
 
 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;
        }
 
        return $tag;


@@ -42,12 +40,13 @@ sub preprocess (@) { #{{{
        my $page = $params{page};
        delete $params{page};
        delete $params{destpage};
        my $page = $params{page};
        delete $params{page};
        delete $params{destpage};

+       delete $params{preview};

 
 

-       $tags{$page} = [];

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

-               push @{$tags{$page}}, $tag;
+               $tag=IkiWiki::linkpage($tag);
+               $tags{$page}{$tag}=1;

                # hidden WikiLink
                # hidden WikiLink

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

        }
                
        return "";
        }
                
        return "";


@@ -61,14 +60,15 @@ sub pagetemplate (@) { #{{{
 
        $template->param(tags => [
                map { 
 
        $template->param(tags => [
                map { 

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

                }
        }
 } # }}}
                }
        }
 } # }}}