tag_autocreate fixups

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index fdd63d637eeac7182a4ef2bed188226eff8a1cdf..1145a9f130966d4c69b1a6ce6b8373fdbaf0eafd 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -6,8 +6,6 @@ use warnings;
 use strict;
 use IkiWiki 3.00;
 
-my %tags;
-
 sub import {
        hook(type => "getopt", id => "tag", call => \&getopt);
        hook(type => "getsetup", id => "tag", call => \&getsetup);
@@ -39,9 +37,9 @@ sub getsetup () {
                tag_autocreate => {
                        type => "boolean",
                        example => 0,
-                       description => "Autocreate new tag pages",
+                       description => "autocreate new tag pages?",
                        safe => 1,
-                       rebuild => 1,
+                       rebuild => undef,
                },
 }
 
@@ -68,17 +66,17 @@ sub taglink ($$$;@) {
 
 sub gentag ($) {
        my $tag=shift;
-       if (defined $config{tag_autocreate} && $config{tag_autocreate}) {
+       if ($config{tag_autocreate}) {
                my $tagfile = newpagefile(tagpage($tag), $config{default_pageext});
                $tagfile=~s/^\///;
 
-               return if (! add_autofile($tagfile, "tag"));
+               add_autofile($tagfile, sub {
+                       debug(sprintf(gettext("creating tag page %s"), $tag));
 
-               debug(sprintf(gettext("creating tag page %s"), $tag));
-
-               my $template=template("autotag.tmpl");
-               $template->param(tag => $tag);
-               writefile($tagfile, $config{srcdir}, $template->output);
+                       my $template=template("autotag.tmpl");
+                       $template->param(tag => $tag);
+                       writefile($tagfile, $config{srcdir}, $template->output);
+               });
        }
 }
 
@@ -94,13 +92,12 @@ sub preprocess_tag (@) {
 
        foreach my $tag (keys %params) {
                $tag=linkpage($tag);
-               $tags{$page}{$tag}=1;
-
+               
+               # hidden WikiLink
+               add_link($page, tagpage($tag), 'tag');
+               
                # add tagpage if necessary
                gentag($tag);
-
-               # hidden WikiLink
-               add_link($page, tagpage($tag));
        }
                
        return "";
@@ -114,15 +111,13 @@ sub preprocess_taglink (@) {
        return join(" ", map {
                if (/(.*)\|(.*)/) {
                        my $tag=linkpage($2);
-                       $tags{$params{page}}{$tag}=1;
-                       add_link($params{page}, tagpage($tag));
+                       add_link($params{page}, tagpage($tag), 'tag');
                        return taglink($params{page}, $params{destpage}, $tag,
                                linktext => pagetitle($1));
                }
                else {
                        my $tag=linkpage($_);
-                       $tags{$params{page}}{$tag}=1;
-                       add_link($params{page}, tagpage($tag));
+                       add_link($params{page}, tagpage($tag), 'tag');
                        return taglink($params{page}, $params{destpage}, $tag);
                }
        }
@@ -137,17 +132,19 @@ sub pagetemplate (@) {
        my $destpage=$params{destpage};
        my $template=$params{template};
 
+       my $tags = $typedlinks{$page}{tag};
+
        $template->param(tags => [
                map { 
                        link => taglink($page, $destpage, $_, rel => "tag")
-               }, sort keys %{$tags{$page}}
-       ]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
+               }, 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 (exists $tags{$page} && %{$tags{$page}}) {
+               if (defined $tags && %$tags) {
                        $template->param(categories => [map { category => $_ },
-                               sort keys %{$tags{$page}}]);
+                               sort keys %$tags]);
                }
        }
 }
@@ -155,9 +152,7 @@ sub pagetemplate (@) {
 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::tagpage($_[1]), linktype => 'tag');
 }
 
 1