From c5919df5f3697e0f8968e2b8f49cd15c1e0aa412 Mon Sep 17 00:00:00 2001
From: joey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>
Date: Fri, 4 Aug 2006 00:01:51 +0000
Subject: * Make aggregator save permalinks and author name to pages as
 metadata. * Add permalink and author support to meta plugin, affecting RSS
 feeds   and blog pages. * Change titlepage() to encode utf-8 alnum
 characters. This is necessary   to avoid UTF-8 creeping into filenames in
 urls. (There are still   some other ways that it can get in.)

---
 IkiWiki/Plugin/aggregate.pm |  3 +--
 IkiWiki/Plugin/inline.pm    |  3 ++-
 IkiWiki/Plugin/meta.pm      | 13 +++++++++++++
 3 files changed, 16 insertions(+), 3 deletions(-)

(limited to 'IkiWiki')

diff --git a/IkiWiki/Plugin/aggregate.pm b/IkiWiki/Plugin/aggregate.pm
index d6592fef3..c6ed6b209 100644
--- a/IkiWiki/Plugin/aggregate.pm
+++ b/IkiWiki/Plugin/aggregate.pm
@@ -289,9 +289,8 @@ sub add_page (@) { #{{{
 	$template->param(title => $params{title})
 		if defined $params{title} && length($params{title});
 	$template->param(content => htmlescape(htmlabs($params{content}, $feed->{feedurl})));
-	$template->param(url => $feed->{url});
 	$template->param(name => $feed->{name});
-	$template->param(link => urlabs($params{link}, $feed->{feedurl}))
+	$template->param(permalink => urlabs($params{link}, $feed->{feedurl}))
 		if defined $params{link};
 	if (ref $feed->{tags}) {
 		$template->param(tags => [map { tag => $_ }, @{$feed->{tags}}]);
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index d8f2ca0d8..71e71c02e 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -173,6 +173,7 @@ sub genrss ($@) { #{{{
 		$itemtemplate->param(
 			title => pagetitle(basename($p)),
 			url => "$config{url}/$renderedfiles{$p}",
+			permalink => "$config{url}/$renderedfiles{$p}",
 			pubdate => date_822($pagectime{$p}),
 			content => absolute_urls(get_inline_content($p, $page), $url),
 		);
@@ -180,6 +181,7 @@ sub genrss ($@) { #{{{
 			shift->(page => $p, destpage => $page,
 				template => $itemtemplate);
 		});
+
 		$content.=$itemtemplate->output;
 		$itemtemplate->clear_params;
 	}
@@ -191,7 +193,6 @@ sub genrss ($@) { #{{{
 		pageurl => $url,
 		content => $content,
 	);
-	
 	run_hooks(pagetemplate => sub {
 		shift->(page => $page, destpage => $page,
 			template => $template);
diff --git a/IkiWiki/Plugin/meta.pm b/IkiWiki/Plugin/meta.pm
index bac163469..b6226ed88 100644
--- a/IkiWiki/Plugin/meta.pm
+++ b/IkiWiki/Plugin/meta.pm
@@ -8,6 +8,8 @@ use IkiWiki;
 
 my %meta;
 my %title;
+my %permalink;
+my %author;
 
 sub import { #{{{
 	IkiWiki::hook(type => "preprocess", id => "meta", 
@@ -57,9 +59,15 @@ sub preprocess (@) { #{{{
 	elsif ($key eq 'title') {
 		$title{$page}=$value;
 	}
+	elsif ($key eq 'permalink') {
+		$permalink{$page}=$value;
+	}
 	else {
 		$meta{$page}.="<meta name=\"".encode_entities($key).
 			"\" content=\"".encode_entities($value)."\" />\n";
+		if ($key eq 'author') {
+			$author{$page}=$value;
+		}
 	}
 
 	return "";
@@ -74,6 +82,11 @@ sub pagetemplate (@) { #{{{
 		if exists $meta{$page} && $template->query(name => "meta");
 	$template->param(title => $title{$page})
 		if exists $title{$page} && $template->query(name => "title");
+	$template->param(permalink => $permalink{$page})
+		if exists $permalink{$page} && $template->query(name => "permalink");
+	$template->param(author => $author{$page})
+		if exists $author{$page} && $template->query(name => "author");
+	
 } # }}}
 
 1
-- 
cgit v1.2.3