summaryrefslogtreecommitdiff
path: root/IkiWiki
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-29 07:25:17 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2006-07-29 07:25:17 +0000
commit267f98e2e116739872cafc6bb712280c31376705 (patch)
tree1bfd114b014f21d7bebd67d8e94f2042335c84d5 /IkiWiki
parenta0653933d324f30838fe04d5f9aaab8b130014b2 (diff)
* Put categories in rss feeds for tagged items.
Diffstat (limited to 'IkiWiki')
-rw-r--r--IkiWiki/Plugin/inline.pm12
-rw-r--r--IkiWiki/Plugin/tag.pm38
2 files changed, 42 insertions, 8 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 06c4a3737..1ea347b08 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -152,7 +152,8 @@ sub genrss ($@) { #{{{
my $url="$config{url}/".htmlpage($page);
- my $template=template("rsspage.tmpl", blind_cache => 1);
+ my $template=template("rsspage.tmpl", blind_cache => 1,
+ die_on_bad_params => 0);
my @items;
foreach my $p (@pages) {
@@ -161,6 +162,7 @@ sub genrss ($@) { #{{{
itemurl => "$config{url}/$renderedfiles{$p}",
itempubdate => date_822($pagectime{$p}),
itemcontent => absolute_urls(get_inline_content($p, $page), $url),
+ page => $p, # used by category adding code in tag plugin
} if exists $renderedfiles{$p};
}
@@ -170,6 +172,14 @@ sub genrss ($@) { #{{{
items => \@items,
);
+ foreach my $id (keys %{$hooks{pagetemplate}}) {
+ $hooks{pagetemplate}{$id}{call}->(
+ page => $page,
+ destpage => $page,
+ template => $template,
+ );
+ }
+
return $template->output;
} #}}}
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 289b48b87..2aa70d406 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -23,6 +23,17 @@ sub getopt () { #{{{
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 "";
@@ -34,13 +45,9 @@ sub preprocess (@) { #{{{
$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;
# hidden WikiLink
- push @{$IkiWiki::links{$page}}, $tag;
+ push @{$IkiWiki::links{$page}}, tagpage($tag);
}
return "";
@@ -53,9 +60,26 @@ 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 => "items")) {
+ # It's an rss template. Modify each item in the feed,
+ # adding any categories based on the page for that item.
+ foreach my $item (@{$template->param("items")}) {
+ my $p=$item->{page};
+ if (exists $tags{$p} && @{$tags{$p}}) {
+ $item->{categories}=[];
+ foreach my $tag (@{$tags{$p}}) {
+ push @{$item->{categories}}, {
+ category => $tag,
+ };
+ }
+ }
+ }
+ }
} # }}}
1