X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/dea23a1031b55dbc408e9f99c761fd667331cccd..f2a87addc63114edd3e096cff286bc3b19989df3:/IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index f1f3b77f5..7a85874f6 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,45 +4,128 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 3.00;
 
-my %tags;
+sub import {
+	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);
+}
 
-sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "tag",
-		call => \&preprocess);
-	IkiWiki::hook(type => "pagetemplate", id => "tag",
-		call => \&pagetemplate);
-} # }}}
+sub getopt () {
+	eval q{use Getopt::Long};
+	error($@) if $@;
+	Getopt::Long::Configure('pass_through');
+	GetOptions("tagbase=s" => \$config{tagbase});
+}
 
-sub preprocess (@) { #{{{
+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;
+			
+	if ($tag !~ m{^\.?/} &&
+	    defined $config{tagbase}) {
+		$tag="/".$config{tagbase}."/".$tag;
+		$tag=~y#/#/#s; # squash dups
+	}
+
+	return $tag;
+}
+
+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 "";
 	}
 	my %params=@_;
 	my $page = $params{page};
 	delete $params{page};
+	delete $params{destpage};
+	delete $params{preview};
 
-	$tags{$page} = [];
 	foreach my $tag (keys %params) {
-		push @{$tags{$page}}, $tag;
+		$tag=linkpage($tag);
 		# hidden WikiLink
-		push @{$IkiWiki::links{$page}}, $tag;
+		add_link($page, tagpage($tag), 'tag');
 	}
 		
 	return "";
-} # }}}
+}
 
-sub pagetemplate (@) { #{{{
+sub preprocess_taglink (@) {
+	if (! @_) {
+		return "";
+	}
+	my %params=@_;
+	return join(" ", map {
+		if (/(.*)\|(.*)/) {
+			my $tag=linkpage($2);
+			add_link($params{page}, tagpage($tag), 'tag');
+			return taglink($params{page}, $params{destpage}, $tag,
+				linktext => pagetitle($1));
+		}
+		else {
+			my $tag=linkpage($_);
+			add_link($params{page}, tagpage($tag), '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};
 	my $destpage=$params{destpage};
 	my $template=$params{template};
 
-	$template->param(tags => join(', ', 
-			map { IkiWiki::htmllink($page, $destpage, $_) } 
-				@{$tags{$page}}))
-		if exists $tags{$page} && $template->query(name => "tags");
-} # }}}
+	my $tags = $typedlinks{$page}{tag};
+
+	$template->param(tags => [
+		map { 
+			link => taglink($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 (defined $tags && %$tags) {
+			$template->param(categories => [map { category => $_ },
+				sort keys %$tags]);
+		}
+	}
+}
+
+package IkiWiki::PageSpec;
+
+sub match_tagged ($$;@) {
+	return match_link($_[0], IkiWiki::Plugin::tag::tagpage($_[1]), linktype => 'tag');
+}
 
 1