X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/8fd9c9accbc3c3e977aa78cb38bf7b264c53bace..132e41500f54d5e5d92ebf0a53349511e5ade6c3:/IkiWiki/Plugin/tag.pm?ds=sidebyside

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index c4e12e61d..3de09a767 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -9,12 +9,31 @@ use IkiWiki;
 my %tags;
 
 sub import { #{{{
+	IkiWiki::hook(type => "getopt", id => "tag",
+		call => \&getopt);
 	IkiWiki::hook(type => "preprocess", id => "tag",
 		call => \&preprocess);
 	IkiWiki::hook(type => "pagetemplate", id => "tag",
 		call => \&pagetemplate);
 } # }}}
 
+sub getopt () { #{{{
+	eval q{use Getopt::Long};
+	Getopt::Long::Configure('pass_through');
+	GetOptions("tagbase=s" => \$IkiWiki::config{tagbase});
+} #}}}
+
+sub tagpage ($) { #{{{
+	my $tag=shift;
+			
+	if (exists $IkiWiki::config{tagbase} &&
+	    defined $IkiWiki::config{tagbase}) {
+		$tag=$IkiWiki::config{tagbase}."/".$tag;
+	}
+
+	return $tag;
+} #}}}
+
 sub preprocess (@) { #{{{
 	if (! @_) {
 		return "";
@@ -28,7 +47,7 @@ sub preprocess (@) { #{{{
 	foreach my $tag (keys %params) {
 		push @{$tags{$page}}, $tag;
 		# hidden WikiLink
-		push @{$IkiWiki::links{$page}}, $tag;
+		push @{$IkiWiki::links{$page}}, tagpage($tag);
 	}
 		
 	return "";
@@ -41,9 +60,17 @@ sub pagetemplate (@) { #{{{
 	my $template=$params{template};
 
 	$template->param(tags => [
-		map { link => IkiWiki::htmllink($page, $destpage, $_) }, 
-			@{$tags{$page}}
+		map { 
+			link => IkiWiki::htmllink($page, $destpage, tagpage($_))
+		}, @{$tags{$page}}
 	]) if exists $tags{$page} && @{$tags{$page}} && $template->query(name => "tags");
+
+	if ($template->query(name => "pubdate")) {
+		# It's an rss template. Add any categories.
+		if (exists $tags{$page} && @{$tags{$page}}) {
+			$template->param(categories => [map { category => $_ }, @{$tags{$page}}]);
+		}
+	}
 } # }}}
 
 1