Merge branch 'master' into autotag

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 90833fd9c4315cbb7887f9e19c3f3851d76276df..d2a3d4dfdb5a3366262afd8c5a7159648a41cbc0 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -6,8 +6,6 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 
 use strict;
 use IkiWiki 3.00;
 

-my %tags;
-

 sub import {
        hook(type => "getopt", id => "tag", call => \&getopt);
        hook(type => "getsetup", id => "tag", call => \&getsetup);
 sub import {
        hook(type => "getopt", id => "tag", call => \&getopt);
        hook(type => "getsetup", id => "tag", call => \&getsetup);


@@ -39,15 +37,15 @@ sub getsetup () {
                tag_autocreate => {
                        type => "boolean",
                        example => 0,
                tag_autocreate => {
                        type => "boolean",
                        example => 0,

-                       description => "Autocreate new tag pages",
+                       description => "autocreate new tag pages?",

                        safe => 1,
                        safe => 1,

-                       rebuild => 1,
+                       rebuild => undef,

                },
 }
 
                },
 }
 

-sub tagpage ($) {
+sub taglink ($) {

        my $tag=shift;
        my $tag=shift;

-                       
+       

        if ($tag !~ m{^\.?/} &&
            defined $config{tagbase}) {
                $tag="/".$config{tagbase}."/".$tag;
        if ($tag !~ m{^\.?/} &&
            defined $config{tagbase}) {
                $tag="/".$config{tagbase}."/".$tag;


@@ -57,29 +55,36 @@ sub tagpage ($) {
        return $tag;
 }
 
        return $tag;
 }
 

-sub taglink ($$$;@) {
+sub htmllink_tag ($$$;@) {

        my $page=shift;
        my $destpage=shift;
        my $tag=shift;
        my %opts=@_;
 
        my $page=shift;
        my $destpage=shift;
        my $tag=shift;
        my %opts=@_;
 

-       return htmllink($page, $destpage, tagpage($tag), %opts);
+       return htmllink($page, $destpage, taglink($tag), %opts);

 }
 
 sub gentag ($) {
        my $tag=shift;
 }
 
 sub gentag ($) {
        my $tag=shift;

-       if (defined $config{tag_autocreate} && $config{tag_autocreate}) {
-               my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
-               $tagfile=~s/^\///;
-               return if (srcfile($tagfile,1));

 
 

-               debug(sprintf(gettext("creating tag page %s"), $tag));
+       if ($config{tag_autocreate}) {
+               my $tagpage=taglink($tag);
+               if ($tagpage=~/^\.\/(.*)/) {
+                       $tagpage=$1;
+               }
+               else {
+                       $tagpage=~s/^\///;
+               }
+
+               my $tagfile = newpagefile($tagpage, $config{default_pageext});

 
 

-               my $template=template("autotag.tmpl");
-               $template->param(tag => $tag);
-               writefile($tagfile, $config{srcdir}, $template->output);
+               add_autofile($tagfile, "tag", sub {
+                       debug(sprintf(gettext("creating tag page %s"), $tag));

 
 

-               IkiWiki::add_autofile("$config{srcdir}/$tagfile");
+                       my $template=template("autotag.tmpl");
+                       $template->param(tag => $tag);
+                       writefile($tagfile, $config{srcdir}, $template->output);
+               });

        }
 }
 
        }
 }
 


@@ -95,13 +100,11 @@ sub preprocess_tag (@) {
 
        foreach my $tag (keys %params) {
                $tag=linkpage($tag);
 
        foreach my $tag (keys %params) {
                $tag=linkpage($tag);

-               $tags{$page}{$tag}=1;
-
-               # add tagpage if necessary
-               gentag($tag);
-
+               

                # hidden WikiLink
                # hidden WikiLink

-               add_link($page, tagpage($tag));
+               add_link($page, taglink($tag), 'tag');
+               
+               gentag($tag);

        }
                
        return "";
        }
                
        return "";


@@ -115,16 +118,16 @@ sub preprocess_taglink (@) {
        return join(" ", map {
                if (/(.*)\|(.*)/) {
                        my $tag=linkpage($2);
        return join(" ", map {
                if (/(.*)\|(.*)/) {
                        my $tag=linkpage($2);

-                       $tags{$params{page}}{$tag}=1;
-                       add_link($params{page}, tagpage($tag));
-                       return taglink($params{page}, $params{destpage}, $tag,
+                       add_link($params{page}, taglink($tag), 'tag');
+                       gentag($tag);
+                       return htmllink_tag($params{page}, $params{destpage}, $tag,

                                linktext => pagetitle($1));
                }
                else {
                        my $tag=linkpage($_);
                                linktext => pagetitle($1));
                }
                else {
                        my $tag=linkpage($_);

-                       $tags{$params{page}}{$tag}=1;
-                       add_link($params{page}, tagpage($tag));
-                       return taglink($params{page}, $params{destpage}, $tag);
+                       add_link($params{page}, taglink($tag), 'tag');
+                       gentag($tag);
+                       return htmllink_tag($params{page}, $params{destpage}, $tag);

                }
        }
        grep {
                }
        }
        grep {


@@ -138,17 +141,19 @@ sub pagetemplate (@) {
        my $destpage=$params{destpage};
        my $template=$params{template};
 
        my $destpage=$params{destpage};
        my $template=$params{template};
 

+       my $tags = $typedlinks{$page}{tag};
+

        $template->param(tags => [
                map { 
        $template->param(tags => [
                map { 

-                       link => taglink($page, $destpage, $_, rel => "tag")
-               }, sort keys %{$tags{$page}}
-       ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
+                       link => htmllink_tag($page, $destpage, $_, rel => "tag")
+               }, sort keys %$tags
+       ]) if defined $tags && %$tags && $template->query(name => "tags");

 
        if ($template->query(name => "categories")) {
                # It's an rss/atom template. Add any categories.
 
        if ($template->query(name => "categories")) {
                # It's an rss/atom template. Add any categories.

-               if (exists $tags{$page} && %{$tags{$page}}) {
+               if (defined $tags && %$tags) {

                        $template->param(categories => [map { category => $_ },
                        $template->param(categories => [map { category => $_ },

-                               sort keys %{$tags{$page}}]);
+                               sort keys %$tags]);

                }
        }
 }
                }
        }
 }


@@ -156,9 +161,7 @@ sub pagetemplate (@) {
 package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {
 package IkiWiki::PageSpec;
 
 sub match_tagged ($$;@) {

-       my $page = shift;
-       my $glob = shift;
-       return match_link($page, IkiWiki::Plugin::tag::tagpage($glob));
+       return match_link($_[0], IkiWiki::Plugin::tag::taglink($_[1]), linktype => 'tag');

 }
 
 1
 }
 
 1