urosm
/
ikiwiki
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* 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.
master
joey 2007-08-11 23:15:08 +00:00
parent 7de36e253c
commit 160326b469
6 changed files with 21 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
IkiWiki/Plugin/inline.pm
View File

@ -361,8 +361,10 @@ sub genfeed ($$$$@) { #{{{
title => pagetitle(basename($p)), title => pagetitle(basename($p)),
url => $u, url => $u,
permalink => $u, permalink => $u,
date_822 => date_822($pagectime{$p}), cdate_822 => date_822($pagectime{$p}),
date_3339 => date_3339($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")) { if ($itemtemplate->query(name => "enclosure")) {
@ -397,7 +399,7 @@ sub genfeed ($$$$@) { #{{{
$content.=$itemtemplate->output; $content.=$itemtemplate->output;
$itemtemplate->clear_params; $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); my $template=template($feedtype."page.tmpl", blind_cache => 1);

6
debian/changelog vendored
View File

@ -15,8 +15,12 @@ ikiwiki (2.6) UNRELEASED; urgency=low
* Updated French translation from Cyril Brulebois. Closes: #437181 * Updated French translation from Cyril Brulebois. Closes: #437181
* The toc directive doesn't work well or make sense inside an inlined page. * 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. 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 ikiwiki (2.5) unstable; urgency=low

4
doc/bugs/correct_published_and_updated_time_information_for_the_feeds.mdwn
View File

@ -108,4 +108,6 @@ Index: IkiWiki/Plugin/inline.pm
>> — [[NicolasLimare]] >> — [[NicolasLimare]]
[[tag patch]] [[done]] --[[Joey]]
[[tag patch]]

3
templates/atomitem.tmpl
View File

@ -11,7 +11,8 @@
<category term="<TMPL_VAR CATEGORY>" /> <category term="<TMPL_VAR CATEGORY>" />
</TMPL_LOOP> </TMPL_LOOP>
</TMPL_IF> </TMPL_IF>
<updated><TMPL_VAR DATE_3339></updated> <updated><TMPL_VAR MDATE_3339></updated>
<published><TMPL_VAR CDATE_3339></published>
<TMPL_IF NAME="ENCLOSURE"> <TMPL_IF NAME="ENCLOSURE">
<link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" /> <link rel="enclosure" type="<TMPL_VAR TYPE>" href="<TMPL_VAR ENCLOSURE>" length="<TMPL_VAR LENGTH>" />
<TMPL_ELSE> <TMPL_ELSE>

5
templates/rssitem.tmpl
View File

@ -1,7 +1,7 @@
<item> <item>
<TMPL_IF NAME="AUTHOR"> <TMPL_IF NAME="AUTHOR">
<title><TMPL_VAR AUTHOR ESCAPE=HTML>: <TMPL_VAR TITLE></title> <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> <TMPL_ELSE>
<title><TMPL_VAR TITLE></title> <title><TMPL_VAR TITLE></title>
</TMPL_IF> </TMPL_IF>
@ -12,7 +12,8 @@
<category><TMPL_VAR CATEGORY></category> <category><TMPL_VAR CATEGORY></category>
</TMPL_LOOP> </TMPL_LOOP>
</TMPL_IF> </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"> <TMPL_IF NAME="ENCLOSURE">
<enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" /> <enclosure url="<TMPL_VAR ENCLOSURE>" type="<TMPL_VAR TYPE>" length="<TMPL_VAR LENGTH>" />
<TMPL_ELSE> <TMPL_ELSE>

4
templates/rsspage.tmpl
View File

@ -1,5 +1,7 @@
<?xml version="1.0"?> <?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> <channel>
<title><TMPL_VAR TITLE></title> <title><TMPL_VAR TITLE></title>
<link><TMPL_VAR PAGEURL></link> <link><TMPL_VAR PAGEURL></link>