Merge commit 'upstream/master' into pub/master

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index ddb67c2a8b5ad52f24c76cd1ff512c27466232e4..d725ef9b3a948f3b5967f66d5ac6dde887a1f633 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,13 +4,15 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
 
 use warnings;
 use strict;

-use IkiWiki;
+use IkiWiki 2.00;

 
 my %tags;
 
 sub import { #{{{
        hook(type => "getopt", id => "tag", call => \&getopt);
 
 my %tags;
 
 sub import { #{{{
        hook(type => "getopt", id => "tag", call => \&getopt);

-       hook(type => "preprocess", id => "tag", call => \&preprocess, scan => 1);
+       hook(type => "getsetup", id => "tag", call => \&getsetup);
+       hook(type => "preprocess", id => "tag", call => \&preprocess_tag, scan => 1);
+       hook(type => "preprocess", id => "taglink", call => \&preprocess_taglink, scan => 1);

        hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
 } # }}}
 
        hook(type => "pagetemplate", id => "tag", call => \&pagetemplate);
 } # }}}
 


@@ -21,18 +23,43 @@ sub getopt () { #{{{
        GetOptions("tagbase=s" => \$config{tagbase});
 } #}}}
 
        GetOptions("tagbase=s" => \$config{tagbase});
 } #}}}
 

+sub getsetup () { #{{{
+       return
+               plugin => {
+                       safe => 1,
+                       rebuild => undef,
+               },
+               tagbase => {
+                       type => "string",
+                       example => "tag",
+                       description => "parent page tags are located under",
+                       safe => 1,
+                       rebuild => 1,
+               },
+} #}}}
+

 sub tagpage ($) { #{{{
        my $tag=shift;
                        
 sub tagpage ($) { #{{{
        my $tag=shift;
                        

-       if (exists $config{tagbase} &&
+       if ($tag !~ m{^\.?/} &&

            defined $config{tagbase}) {
            defined $config{tagbase}) {

-               $tag=$config{tagbase}."/".$tag;
+               $tag="/".$config{tagbase}."/".$tag;
+               $tag=~y#/#/#s; # squash dups

        }
 
        return $tag;
 } #}}}
 
        }
 
        return $tag;
 } #}}}
 

-sub preprocess (@) { #{{{
+sub taglink ($$$;@) { #{{{
+       my $page=shift;
+       my $destpage=shift;
+       my $tag=shift;
+       my %opts=@_;
+
+       return htmllink($page, $destpage, tagpage($tag), %opts);
+} #}}}
+
+sub preprocess_tag (@) { #{{{

        if (! @_) {
                return "";
        }
        if (! @_) {
                return "";
        }


@@ -40,10 +67,11 @@ 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=linkpage($tag);
+               $tags{$page}{$tag}=1;

                # hidden WikiLink
                push @{$links{$page}}, tagpage($tag);
        }
                # hidden WikiLink
                push @{$links{$page}}, tagpage($tag);
        }


@@ -51,6 +79,31 @@ sub preprocess (@) { #{{{
        return "";
 } # }}}
 
        return "";
 } # }}}
 

+sub preprocess_taglink (@) { #{{{
+       if (! @_) {
+               return "";
+       }
+       my %params=@_;
+       return join(" ", map {
+               if (/(.*)\|(.*)/) {
+                       my $tag=linkpage($2);
+                       $tags{$params{page}}{$tag}=1;
+                       push @{$links{$params{page}}}, tagpage($tag);
+                       return taglink($params{page}, $params{destpage}, $tag,
+                               linktext => pagetitle($1));
+               }
+               else {
+                       my $tag=linkpage($_);
+                       $tags{$params{page}}{$tag}=1;
+                       push @{$links{$params{page}}}, tagpage($tag);
+                       return taglink($params{page}, $params{destpage}, $tag);
+               }
+       }
+       grep {
+               $_ ne 'page' && $_ ne 'destpage' && $_ ne 'preview'
+       } keys %params);
+} # }}}
+

 sub pagetemplate (@) { #{{{
        my %params=@_;
        my $page=$params{page};
 sub pagetemplate (@) { #{{{
        my %params=@_;
        my $page=$params{page};


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

-                       link => 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}}]);
+                       link => taglink($page, $destpage, $_, rel => "tag")
+               }, sort keys %{$tags{$page}}
+       ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
+
+       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}}]);

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