X-Git-Url: http://git.vanrenterghem.biz/git.ikiwiki.info.git/blobdiff_plain/20eacc2c1f74d0ab617dca36378a35920e313a23..d2a369537688d31884a2a90886768dfc90b8d706:/IkiWiki/Plugin/tag.pm diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm index a6eddb019..f0e3c223c 100644 --- a/IkiWiki/Plugin/tag.pm +++ b/IkiWiki/Plugin/tag.pm @@ -4,43 +4,102 @@ package IkiWiki::Plugin::tag; use warnings; use strict; -use IkiWiki; +use IkiWiki 2.00; 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_tag, scan => 1); + hook(type => "preprocess", id => "taglink", call => \&preprocess_taglink, scan => 1); + hook(type => "pagetemplate", id => "tag", call => \&pagetemplate); } # }}} -sub preprocess (@) { #{{{ +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_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=IkiWiki::linkpage($tag); + $tags{$page}{$tag}=1; # hidden WikiLink - push @{$IkiWiki::links{$page}}, $tag; + push @{$links{$page}}, tagpage($tag); } return ""; } # }}} -sub pagetemplate ($$) { #{{{ - my $page=shift; - my $template=shift; +sub preprocess_taglink (@) { #{{{ + if (! @_) { + return ""; + } + my %params=@_; + return join(" ", map { + if (/(.*)\|(.*)/) { + my $tag=IkiWiki::linkpage($2); + $tags{$params{page}}{$tag}=1; + push @{$links{$params{page}}}, tagpage($tag); + return htmllink($params{page}, $params{destpage}, + tagpage($tag), + linktext => IkiWiki::pagetitle($1)); + } + else { + my $tag=IkiWiki::linkpage($_); + $tags{$params{page}}{$tag}=1; + push @{$links{$params{page}}}, tagpage($tag); + return htmllink($params{page}, $params{destpage}, + tagpage($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 => [ + map { + link => htmllink($page, $destpage, tagpage($_), + rel => "tag") + }, sort keys %{$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 => "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