summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-08-11 23:15:08 +0000
committerjoey <joey@0fa5a96a-9a0e-0410-b3b2-a0fd24251071>2007-08-11 23:15:08 +0000
commit160326b46936d94bd60727112ad31e45360c9ee0 (patch)
treee625be78574f10cef1f3f3a6b5708e470ecc436f
parent7de36e253c579bd236387e44de78be14422efac7 (diff)
* Apply a patch from NicolasLimare adding modification date tags to rss and
atom feeds, and also changing the publication time for a feed to the newest modiciation time (was newest creation time). * The patch also adds dcterms:creator to rss items that have a known author.
-rw-r--r--IkiWiki/Plugin/inline.pm8
-rw-r--r--debian/changelog6
-rw-r--r--doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn4
-rw-r--r--templates/atomitem.tmpl3
-rw-r--r--templates/rssitem.tmpl5
-rw-r--r--templates/rsspage.tmpl4
6 files changed, 21 insertions, 9 deletions
diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 5378cc939..fee3e06b7 100644
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -361,8 +361,10 @@ sub genfeed ($$$$@) { #{{{
title => pagetitle(basename($p)),
url => $u,
permalink => $u,
- date_822 => date_822($pagectime{$p}),
- date_3339 => date_3339($pagectime{$p}),
+ cdate_822 => date_822($pagectime{$p}),
+ mdate_822 => date_822($pagemtime{$p}),
+ cdate_3339 => date_3339($pagectime{$p}),
+ mdate_3339 => date_3339($pagemtime{$p}),
);
if ($itemtemplate->query(name => "enclosure")) {
@@ -397,7 +399,7 @@ sub genfeed ($$$$@) { #{{{
$content.=$itemtemplate->output;
$itemtemplate->clear_params;
- $lasttime = $pagectime{$p} if $pagectime{$p} > $lasttime;
+ $lasttime = $pagemtime{$p} if $pagemtime{$p} > $lasttime;
}
my $template=template($feedtype."page.tmpl", blind_cache => 1);
diff --git a/debian/changelog b/debian/changelog
index f3afac013..470a3ece5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,8 +15,12 @@ ikiwiki (2.6) UNRELEASED; urgency=low
* Updated French translation from Cyril Brulebois. Closes: #437181
* The toc directive doesn't work well or make sense inside an inlined page.
Disable it when the page with the toc is nested inside another page.
+ * Apply a patch from NicolasLimare adding modification date tags to rss and
+ atom feeds, and also changing the publication time for a feed to the
+ newest modiciation time (was newest creation time).
+ * The patch also adds dcterms:creator to rss items that have a known author.
- -- Joey Hess <joeyh@debian.org> Sat, 11 Aug 2007 17:40:45 -0400
+ -- Joey Hess <joeyh@debian.org> Sat, 11 Aug 2007 18:25:28 -0400
ikiwiki (2.5) unstable; urgency=low
diff --git a/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn b/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn
index 645376786..082f0800c 100644
--- a/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn
+++ b/doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn
@@ -108,4 +108,6 @@ Index: IkiWiki/Plugin/inline.pm
>> — [[NicolasLimare]]
-[[tag patch]] \ No newline at end of file
+[[done]] --[[Joey]]
+
+[[tag patch]]
diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 9190fcc84..4dc2d07d6 100644
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -11,7 +11,8 @@
<category term="<TMPL_VAR CATEGORY>" />
</TMPL_LOOP>
</TMPL_IF>
- <updated><TMPL_VAR DATE_3339></updated>
+ <updated><TMPL_VAR MDATE_3339></updated>
+ <published><TMPL_VAR CDATE_3339></published>
<TMPL_IF NAME="ENCLOSURE">
<link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
<TMPL_ELSE>
diff --git a/templates/rssitem.tmpl b/templates/rssitem.tmpl
index c243b74b3..f22e5e3fb 100644
--- a/templates/rssitem.tmpl
+++ b/templates/rssitem.tmpl
@@ -1,7 +1,7 @@
<item>
<TMPL_IF NAME="AUTHOR">
<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title>
- <dc:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dc:creator>
+ <dcterms:creator><TMPL_VAR AUTHOR ESCAPE=HTML></dcterms:creator>
<TMPL_ELSE>
<title><TMPL_VAR TITLE></title>
</TMPL_IF>
@@ -12,7 +12,8 @@
<category><TMPL_VAR CATEGORY></category>
</TMPL_LOOP>
</TMPL_IF>
- <pubDate><TMPL_VAR DATE_822></pubDate>
+ <pubDate><TMPL_VAR CDATE_822></pubDate>
+ <dcterms:modified><TMPL_VAR MDATE_3339></dcterms:modified>
<TMPL_IF NAME="ENCLOSURE">
<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
<TMPL_ELSE>
diff --git a/templates/rsspage.tmpl b/templates/rsspage.tmpl
index 34c1a33ce..e54094aaa 100644
--- a/templates/rsspage.tmpl
+++ b/templates/rsspage.tmpl
@@ -1,5 +1,7 @@
<?xml version="1.0"?>
-<rss version="2.0" xmlns:dc="http://purl.org/dc/elements/1.1/">
+<rss version="2.0"
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:dcterms="http://purl.org/dc/terms/" >
<channel>
<title><TMPL_VAR TITLE></title>
<link><TMPL_VAR PAGEURL></link>