* 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.

diff --git a/IkiWiki/Plugin/inline.pm b/IkiWiki/Plugin/inline.pm
index 5378cc9391bd98db8a621b80b647ba0198dd7676..fee3e06b7f4d5dc234eb6a72a18c8683a6c490c3 100644 (file)
--- a/IkiWiki/Plugin/inline.pm
+++ b/IkiWiki/Plugin/inline.pm
@@ -361,8 +361,10 @@ sub genfeed ($$$$@) { #{{{
                        title => pagetitle(basename($p)),
                        url => $u,
                        permalink => $u,
                        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")) {
                );
 
                if ($itemtemplate->query(name => "enclosure")) {


@@ -397,7 +399,7 @@ sub genfeed ($$$$@) { #{{{
                $content.=$itemtemplate->output;
                $itemtemplate->clear_params;
 
                $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);
        }
 
        my $template=template($feedtype."page.tmpl", blind_cache => 1);

diff --git a/debian/changelog b/debian/changelog
index f3afac0138afeef3667185e0c210ee9639b3d4bf..470a3ece5c4d0623899d21d25c981b7f8694b8ef 100644 (file)
--- 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.
   * 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
 
 
 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 645376786e4a4e99b606be5970f09d22a9ad8510..082f0800c6c84a926476e0f09f72960f300408ff 100644 (file)
--- 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]]
 
 
 >> — [[NicolasLimare]]
 

-[[tag patch]]
\ No newline at end of file
+[[done]] --[[Joey]]
+
+[[tag patch]]

diff --git a/templates/atomitem.tmpl b/templates/atomitem.tmpl
index 9190fcc842d3ffe8bdec47935ec333ae0be8bf49..4dc2d07d6d1d8bfd726427253d4b8772841e442f 100644 (file)
--- a/templates/atomitem.tmpl
+++ b/templates/atomitem.tmpl
@@ -11,7 +11,8 @@
        <category term="<TMPL_VAR CATEGORY>" />
        </TMPL_LOOP>
        </TMPL_IF>
        <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>
        <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 c243b74b3b140fcc5975f58d3be468d59942c751..f22e5e3fb99c3cba669bccc860618559aad4de5a 100644 (file)
--- 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>
 <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>
        <TMPL_ELSE>
        <title><TMPL_VAR TITLE></title>
        </TMPL_IF>


@@ -12,7 +12,8 @@
        <category><TMPL_VAR CATEGORY></category>
        </TMPL_LOOP>
        </TMPL_IF>
        <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>
        <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 34c1a33ce290c8b151a938359c78e61053fc81c3..e54094aaa2f1ddbc7e7b1cde73827eca9ad7da89 100644 (file)
--- a/templates/rsspage.tmpl
+++ b/templates/rsspage.tmpl
@@ -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>
 <title><TMPL_VAR TITLE></title>
 <link><TMPL_VAR PAGEURL></link>
 <channel>
 <title><TMPL_VAR TITLE></title>
 <link><TMPL_VAR PAGEURL></link>