Merge branch 'ready/tag-test' into transient-tag

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

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index d2a3d4dfdb5a3366262afd8c5a7159648a41cbc0..fd5ce1e8a91488ce5d5b20709001fd3d177def97 100644 (file)
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -36,7 +36,7 @@ sub getsetup () {
                },
                tag_autocreate => {
                        type => "boolean",
                },
                tag_autocreate => {
                        type => "boolean",

-                       example => 0,
+                       example => 1,

                        description => "autocreate new tag pages?",
                        safe => 1,
                        rebuild => undef,
                        description => "autocreate new tag pages?",
                        safe => 1,
                        rebuild => undef,


@@ -46,7 +46,7 @@ sub getsetup () {
 sub taglink ($) {
        my $tag=shift;
        
 sub taglink ($) {
        my $tag=shift;
        

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

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


@@ -55,6 +55,17 @@ sub taglink ($) {
        return $tag;
 }
 
        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;
 sub htmllink_tag ($$$;@) {
        my $page=shift;
        my $destpage=shift;


@@ -67,7 +78,8 @@ sub htmllink_tag ($$$;@) {
 sub gentag ($) {
        my $tag=shift;
 
 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;
                my $tagpage=taglink($tag);
                if ($tagpage=~/^\.\/(.*)/) {
                        $tagpage=$1;


@@ -79,11 +91,19 @@ sub gentag ($) {
                my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
                add_autofile($tagfile, "tag", sub {
                my $tagfile = newpagefile($tagpage, $config{default_pageext});
 
                add_autofile($tagfile, "tag", sub {

-                       debug(sprintf(gettext("creating tag page %s"), $tag));
+                       my $message=sprintf(gettext("creating tag page %s"), $tagpage);
+                       debug($message);

 
                        my $template=template("autotag.tmpl");
 
                        my $template=template("autotag.tmpl");

+                       $template->param(tagname => tagname($tag));

                        $template->param(tag => $tag);
                        writefile($tagfile, $config{srcdir}, $template->output);
                        $template->param(tag => $tag);
                        writefile($tagfile, $config{srcdir}, $template->output);

+                       if ($config{rcs}) {
+                               IkiWiki::disable_commit_hook();
+                               IkiWiki::rcs_add($tagfile);
+                               IkiWiki::rcs_commit_staged(message => $message);
+                               IkiWiki::enable_commit_hook();
+                       }

                });
        }
 }
                });
        }
 }


@@ -145,14 +165,15 @@ sub pagetemplate (@) {
 
        $template->param(tags => [
                map { 
 
        $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) {
                }, 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 => $_ },
+                       $template->param(categories => [map { category => tagname($_) },

                                sort keys %$tags]);
                }
        }
                                sort keys %$tags]);
                }
        }


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

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

 }
 
 1
 }
 
 1