X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/20eacc2c1f74d0ab617dca36378a35920e313a23..35ee7e44a62f9126a83c1243b549d47cc5ca7b43:/IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index a6eddb019..ddb67c2a8 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -9,12 +9,29 @@ use IkiWiki;
 my %tags;
 
 sub import { #{{{
-	IkiWiki::hook(type => "preprocess", id => "tag",
-		call => \&preprocess);
-	IkiWiki::hook(type => "pagetemplate", id => "tag",
-		call => \&pagetemplate);
+	hook(type => "getopt", id => "tag", call => \&getopt);
+	hook(type => "preprocess", id => "tag", call => \&preprocess, scan => 1);
+	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 tagpage ($) { #{{{
+	my $tag=shift;
+			
+	if (exists $config{tagbase} &&
+	    defined $config{tagbase}) {
+		$tag=$config{tagbase}."/".$tag;
+	}
+
+	return $tag;
+} #}}}
+
 sub preprocess (@) { #{{{
 	if (! @_) {
 		return "";
@@ -22,25 +39,36 @@ sub preprocess (@) { #{{{
 	my %params=@_;
 	my $page = $params{page};
 	delete $params{page};
+	delete $params{destpage};
 
 	$tags{$page} = [];
 	foreach my $tag (keys %params) {
 		push @{$tags{$page}}, $tag;
 		# hidden WikiLink
-		push @{$IkiWiki::links{$page}}, $tag;
+		push @{$links{$page}}, tagpage($tag);
 	}
 		
 	return "";
 } # }}}
 
-sub pagetemplate ($$) { #{{{
-	my $page=shift;
-	my $template=shift;
+sub pagetemplate (@) { #{{{
+	my %params=@_;
+	my $page=$params{page};
+	my $destpage=$params{destpage};
+	my $template=$params{template};
+
+	$template->param(tags => [
+		map { 
+			link => htmllink($page, $destpage, tagpage($_))
+		}, @{$tags{$page}}
+	]) if exists $tags{$page} && @{$tags{$page}} && $template->query(name => "tags");
 
-	$template->param(tags => join(', ', 
-			map { IkiWiki::htmllink($page, $page, $_) } 
-				@{$tags{$page}}))
-		if exists $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