X-Git-Url: https://sipb.mit.edu/gitweb.cgi/ikiwiki.git/blobdiff_plain/a0653933d324f30838fe04d5f9aaab8b130014b2..cf35ee04cddd7b9b39636499dd24b689443c0e97:/IkiWiki/Plugin/tag.pm

diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 289b48b87..48ed1a8f8 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -4,23 +4,32 @@ package IkiWiki::Plugin::tag;
 
 use warnings;
 use strict;
-use IkiWiki;
+use IkiWiki 2.00;
 
 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);
+	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" => \$IkiWiki::config{tagbase});
+	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 (@) { #{{{
@@ -31,16 +40,13 @@ sub preprocess (@) { #{{{
 	my $page = $params{page};
 	delete $params{page};
 	delete $params{destpage};
+	delete $params{preview};
 
-	$tags{$page} = [];
 	foreach my $tag (keys %params) {
-		if (exists $IkiWiki::config{tagbase} &&
-		    defined $IkiWiki::config{tagbase}) {
-			$tag=$IkiWiki::config{tagbase}."/".$tag;
-		}
-		push @{$tags{$page}}, $tag;
+		$tag=IkiWiki::linkpage($tag);
+		$tags{$page}{$tag}=1;
 		# hidden WikiLink
-		push @{$IkiWiki::links{$page}}, $tag;
+		push @{$links{$page}}, tagpage($tag);
 	}
 		
 	return "";
@@ -53,9 +59,18 @@ sub pagetemplate (@) { #{{{
 	my $template=$params{template};
 
 	$template->param(tags => [
-		map { link => IkiWiki::htmllink($page, $destpage, $_) }, 
-			@{$tags{$page}}
-	]) if exists $tags{$page} && @{$tags{$page}} && $template->query(name => "tags");
+		map { 
+			link => htmllink($page, $destpage, tagpage($_))
+		}, sort keys %{$tags{$page}}
+	]) if exists $tags{$page} && %{$tags{$page}} && $template->query(name => "tags");
+
+	if ($template->query(name => "categories")) {
+		# It's an rss/atom template. Add any categories.
+		if (exists $tags{$page} && %{$tags{$page}}) {
+			$template->param(categories => [map { category => $_ },
+				sort keys %{$tags{$page}}]);
+		}
+	}
 } # }}}
 
 1