(no commit message)

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index a7f37a5122b30da2a8716200093a98ef3aa6f189..8a0859b5ca48d45f12ccde0f4c823bb5bed913c4 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -7,11 +7,14 @@ use strict;
 use IkiWiki 3.00;
 
 sub import {
+       hook(type => "checkconfig", id => "tag", call => \&checkconfig);
        hook(type => "getopt", id => "tag", call => \&getopt);
        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);
+
+       IkiWiki::loadplugin("transient");
 }
 
 sub getopt () {
@@ -36,17 +39,31 @@ sub getsetup () {
                },
                tag_autocreate => {
                        type => "boolean",
-                       example => 0,
+                       example => 1,
                        description => "autocreate new tag pages?",
                        safe => 1,
                        rebuild => undef,
                },
+               tag_autocreate_commit => {
+                       type => "boolean",
+                       example => 1,
+                       default => 1,
+                       description => "commit autocreated tag pages",
+                       safe => 1,
+                       rebuild => 0,
+               },
+}
+
+sub checkconfig () {
+       if (! defined $config{tag_autocreate_commit}) {
+               $config{tag_autocreate_commit} = 1;
+       }
 }
 
 sub taglink ($) {
        my $tag=shift;
        
-       if ($tag !~ m{^\.?/} &&
+       if ($tag !~ m{^/} &&
            defined $config{tagbase}) {
                $tag="/".$config{tagbase}."/".$tag;
                $tag=~y#/#/#s; # squash dups
@@ -55,6 +72,17 @@ sub taglink ($) {
        return $tag;
 }
 
+# Returns a tag name from a tag link
+sub tagname ($) {
+       my $tag=shift;
+       if (defined $config{tagbase}) {
+               $tag =~ s!^/\Q$config{tagbase}\E/!!;
+       } else {
+               $tag =~ s!^\.?/!!;
+       }
+       return pagetitle($tag, 1);
+}
+
 sub htmllink_tag ($$$;@) {
        my $page=shift;
        my $destpage=shift;
@@ -67,7 +95,8 @@ sub htmllink_tag ($$$;@) {
 sub gentag ($) {
        my $tag=shift;
 
-       if ($config{tag_autocreate}) {
+       if ($config{tag_autocreate} ||
+           ($config{tagbase} && ! defined $config{tag_autocreate})) {
                my $tagpage=taglink($tag);
                if ($tagpage=~/^\.\/(.*)/) {
                        $tagpage=$1;
@@ -75,6 +104,9 @@ sub gentag ($) {
                else {
                        $tagpage=~s/^\///;
                }
+               if (exists $IkiWiki::pagecase{lc $tagpage}) {
+                       $tagpage=$IkiWiki::pagecase{lc $tagpage}
+               }
 
                my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
@@ -83,13 +115,20 @@ sub gentag ($) {
                        debug($message);
 
                        my $template=template("autotag.tmpl");
-                       $template->param(tagname => IkiWiki::basename($tag));
+                       $template->param(tagname => tagname($tag));
                        $template->param(tag => $tag);
-                       writefile($tagfile, $config{srcdir}, $template->output);
-                       if ($config{rcs}) {
+
+                       my $dir = $config{srcdir};
+                       if (! $config{tag_autocreate_commit}) {
+                               no warnings 'once';
+                               $dir = $IkiWiki::Plugin::transient::transientdir;
+                       }
+
+                       writefile($tagfile, $dir, $template->output);
+                       if ($config{rcs} && $config{tag_autocreate_commit}) {
                                IkiWiki::disable_commit_hook();
                                IkiWiki::rcs_add($tagfile);
-                               IkiWiki::rcs_commit_staged($message, undef, undef);
+                               IkiWiki::rcs_commit_staged(message => $message);
                                IkiWiki::enable_commit_hook();
                        }
                });
@@ -153,15 +192,18 @@ sub pagetemplate (@) {
 
        $template->param(tags => [
                map { 
-                       link => htmllink_tag($page, $destpage, $_, rel => "tag")
+                       link => htmllink_tag($page, $destpage, $_,
+                                       rel => "tag", linktext => tagname($_))
                }, 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 (defined $tags && %$tags) {
-                       $template->param(categories => [map { category => $_ },
-                               sort keys %$tags]);
+                       eval q{use HTML::Entities};
+                       $template->param(categories =>
+                               [map { category => HTML::Entities::encode_entities_numeric(tagname($_)) },
+                                       sort keys %$tags]);
                }
        }
 }