From e4ccc4f3b09aaaa4f64bdba1d6ffff24e924fd20 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Mon, 31 Jul 2006 00:34:18 +0000
Subject: fix title metadata on blogs, reorg needed to do it, simplified tag
 some

---
 IkiWiki/Plugin/inline.pm | 31 +++++++++++++++++++------------
 IkiWiki/Plugin/tag.pm    | 17 ++++-------------
 2 files changed, 23 insertions(+), 25 deletions(-)

(limited to 'IkiWiki/Plugin')

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index b06470bfe..110410abc 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -88,7 +88,7 @@ sub preprocess_inline (@) { #{{{
 		my $link=htmlpage(bestlink($params{page}, $page));
 		$link=abs2rel($link, dirname($params{page}));
 		$template->param(pageurl => $link);
-		$template->param(title => $page);
+		$template->param(title => pagetitle(basename($page)));
 		$template->param(content => get_inline_content($page, $params{page}))
 			if $params{archive} eq "no";
 		$template->param(ctime => displaytime($pagectime{$page}));
@@ -161,25 +161,32 @@ sub genrss ($@) { #{{{
 	
 	my $url="$config{url}/".htmlpage($page);
 	
-	my $template=template("rsspage.tmpl", blind_cache => 1,
+	my $itemtemplate=template("rssitem.tmpl", blind_cache => 1, 
 		die_on_bad_params => 0);
-	
-	my @items;
+	my $content="";
 	foreach my $p (@pages) {
-		push @items, {
-			itemtitle => pagetitle(basename($p)),
-			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};
+		next unless exists $renderedfiles{$p};
+
+		$itemtemplate->param(
+			title => pagetitle(basename($p)),
+			url => "$config{url}/$renderedfiles{$p}",
+			pubdate => date_822($pagectime{$p}),
+			content => absolute_urls(get_inline_content($p, $page), $url),
+		);
+		run_hooks(pagetemplate => sub {
+			shift->(page => $p, destpage => $page,
+				template => $itemtemplate);
+		});
+		$content.=$itemtemplate->output;
+		$itemtemplate->clear_params;
 	}
 
+	my $template=template("rsspage.tmpl", blind_cache => 1);
 	$template->param(
 		title => $config{wikiname},
 		wikiname => $config{wikiname},
 		pageurl => $url,
-		items => \@items,
+		content => $content,
 	);
 	
 	run_hooks(pagetemplate => sub {
diff --git a/IkiWiki/Plugin/tag.pm b/IkiWiki/Plugin/tag.pm
index 2aa70d406..3de09a767 100644
--- a/IkiWiki/Plugin/tag.pm
+++ b/IkiWiki/Plugin/tag.pm
@@ -65,19 +65,10 @@ sub pagetemplate (@) { #{{{
 		}, @{$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,
-					};
-				}
-			}
+	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}}]);
 		}
 	}
 } # }}}
-- 
cgit v1.2.3