projects
/
ikiwiki.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
few more suggestions
[ikiwiki.git]
/
IkiWiki
/
Plugin
/
tag.pm
diff --git
a/IkiWiki/Plugin/tag.pm
b/IkiWiki/Plugin/tag.pm
index d439109104a8fd10dfd8ea329d083b4241c42fd0..7a85874f6e928e11e85ec57aee279b0d8197687c 100644
(file)
--- a/
IkiWiki/Plugin/tag.pm
+++ b/
IkiWiki/Plugin/tag.pm
@@
-6,8
+6,6
@@
use warnings;
use strict;
use IkiWiki 3.00;
use strict;
use IkiWiki 3.00;
-my %tags;
-
sub import {
hook(type => "getopt", id => "tag", call => \&getopt);
hook(type => "getsetup", id => "tag", call => \&getsetup);
sub import {
hook(type => "getopt", id => "tag", call => \&getopt);
hook(type => "getsetup", id => "tag", call => \&getsetup);
@@
-71,9
+69,8
@@
sub preprocess_tag (@) {
foreach my $tag (keys %params) {
$tag=linkpage($tag);
foreach my $tag (keys %params) {
$tag=linkpage($tag);
- $tags{$page}{$tag}=1;
# hidden WikiLink
# hidden WikiLink
-
push @{$links{$page}}, tagpage($tag
);
+
add_link($page, tagpage($tag), 'tag'
);
}
return "";
}
return "";
@@
-87,15
+84,13
@@
sub preprocess_taglink (@) {
return join(" ", map {
if (/(.*)\|(.*)/) {
my $tag=linkpage($2);
return join(" ", map {
if (/(.*)\|(.*)/) {
my $tag=linkpage($2);
- $tags{$params{page}}{$tag}=1;
- push @{$links{$params{page}}}, tagpage($tag);
+ add_link($params{page}, tagpage($tag), 'tag');
return taglink($params{page}, $params{destpage}, $tag,
linktext => pagetitle($1));
}
else {
my $tag=linkpage($_);
return taglink($params{page}, $params{destpage}, $tag,
linktext => pagetitle($1));
}
else {
my $tag=linkpage($_);
- $tags{$params{page}}{$tag}=1;
- push @{$links{$params{page}}}, tagpage($tag);
+ add_link($params{page}, tagpage($tag), 'tag');
return taglink($params{page}, $params{destpage}, $tag);
}
}
return taglink($params{page}, $params{destpage}, $tag);
}
}
@@
-110,19
+105,27
@@
sub pagetemplate (@) {
my $destpage=$params{destpage};
my $template=$params{template};
my $destpage=$params{destpage};
my $template=$params{template};
+ my $tags = $typedlinks{$page}{tag};
+
$template->param(tags => [
map {
link => taglink($page, $destpage, $_, rel => "tag")
$template->param(tags => [
map {
link => taglink($page, $destpage, $_, rel => "tag")
- }, sort keys %
{$tags{$page}}
- ]) if
exists $tags{$page} && %{$tags{$page}}
&& $template->query(name => "tags");
+ }, 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 ($template->query(name => "categories")) {
# It's an rss/atom template. Add any categories.
- if (
exists $tags{$page} && %{$tags{$page}}
) {
+ if (
defined $tags && %$tags
) {
$template->param(categories => [map { category => $_ },
$template->param(categories => [map { category => $_ },
- sort keys %
{$tags{$page}}
]);
+ sort keys %
$tags
]);
}
}
}
}
}
}
+package IkiWiki::PageSpec;
+
+sub match_tagged ($$;@) {
+ return match_link($_[0], IkiWiki::Plugin::tag::tagpage($_[1]), linktype => 'tag');
+}
+
1
1