From 1b9ed1b6f1331c11df10ab9611909d4fb2bbf1d3 Mon Sep 17 00:00:00 2001
From: Luke Edwards <ledwards@silverstripe.com>
Date: Sun, 20 Nov 2016 00:24:02 +1300
Subject: [PATCH] ENH: Add partial caching to RSS feed

MINOR: Replay keywords with iTunes category field
---
 code/pagetypes/PodcastPage.php  |  5 +++--
 templates/RSS/PodcastRSSFeed.ss | 28 ++++++++++++----------------
 2 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/code/pagetypes/PodcastPage.php b/code/pagetypes/PodcastPage.php
index 9c2e2ca..5ca0d76 100644
--- a/code/pagetypes/PodcastPage.php
+++ b/code/pagetypes/PodcastPage.php
@@ -17,7 +17,7 @@ class PodcastPage extends Page implements PermissionProvider
         ,'Complete' => 'Boolean'
         ,'Block' => 'Boolean'
         ,'Explicit' => 'enum("No, Clean, Yes");'
-        ,'Keywords' => 'Text'
+        ,'Categories' => 'Text'
     );
 
     private static $has_one = array(
@@ -161,7 +161,7 @@ public function getCMSFields()
             ,$completeField
             ,$blockField
             ,$explicitField
-            ,TextAreaField::create('Keywords')
+            ,TextAreaField::create('Categories')
             ,$podcastImage
         ));
 
@@ -231,6 +231,7 @@ public function init()
      */
     public function rss()
     {
+        $this->response->addHeader("Content-Type", "application/xml");
         return $this->renderWith("PodcastRSSFeed");
     }
 
diff --git a/templates/RSS/PodcastRSSFeed.ss b/templates/RSS/PodcastRSSFeed.ss
index 833d6f3..0152cfe 100644
--- a/templates/RSS/PodcastRSSFeed.ss
+++ b/templates/RSS/PodcastRSSFeed.ss
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<rss version="2.0" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd">
+<rss version="2.0" xmlns:itunes="http://www.itunes.com/dtds/podcast-1.0.dtd" xmlns:atom="http://www.w3.org/2005/Atom">
 <channel>
 <atom:link href="{$AbsoluteLink}rss" rel="self" type="application/rss+xml" />
 
@@ -9,37 +9,33 @@
 <% if $Copyright %><copyright>$Copyright.XML</copyright><% end_if %>
 <% if $Subtitle %><itunes:subtitle>$Subtitle.XML</itunes:subtitle><% end_if %>
 <% if $Author %><itunes:author>$Author.XML</itunes:author><% end_if %>
-<% if $Summary %>
-<itunes:summary>$Summary.NoHTML.XML</itunes:summary>
-<description>$Summary.NoHTML.XML</description>
-<% end_if %>
-<% if $OwnerName || $OwnerEmail %>
-<itunes:owner>
+<% if $Summary %><itunes:summary>$Summary.NoHTML.XML</itunes:summary>
+<description>$Summary.NoHTML.XML</description><% end_if %>
+<% if $Categories %>$Categories.RAW<% end_if %>
+<% if $OwnerName || $OwnerEmail %><itunes:owner>
 	<% if $OwnerName %><itunes:name>$OwnerName.XML</itunes:name><% end_if %>
 	<% if $OwnerEmail %><itunes:email>$OwnerEmail.XML</itunes:email><% end_if %>
-</itunes:owner>
-<% end_if %>
+</itunes:owner><% end_if %>
 <% if $PodcastImage %><itunes:image href="$PodcastImage.getAbsoluteURL" /><% end_if %>
 <% if $Block %><itunes:block>yes</itunes:block><% end_if %>
 <% if $Explicit %><itunes:explicit>$Explicit</itunes:explicit><% end_if %>
-
+<% cached 'Podcast', $List('PodcastEpisode').max('LastEdited'), $List('PodcastEpisode').count() %>
 <% if $podcastEpisodes %><% loop $podcastEpisodes %>
 <item>
 	<% if $EpisodeTitle %><title>$EpisodeTitle.XML</title><% end_if %>
 	<% if $EpisodeAuthor %><itunes:author>$EpisodeAuthor.XML</itunes:author><% end_if %>
 	<% if $EpisodeSubtitle %><itunes:subtitle>$EpisodeSubtitle.XML</itunes:subtitle><% end_if %>
-	<% if $EpisodeSummary %>
-	<itunes:summary>$EpisodeSummary.NoHTML.XML</itunes:summary>
-	<description>$EpisodeSummary.NoHTML.XML</description>
-	<% end_if %>
+	<% if $EpisodeSummary %><itunes:summary>$EpisodeSummary.NoHTML.XML</itunes:summary>
+	<description>$EpisodeSummary.NoHTML.XML</description><% end_if %>
 	<% if $EpisodeImage %><itunes:image href="$EpisodeImage.getAbsoluteURL" /><% end_if %>
 	<% if $EpisodeFile %><enclosure url="$EpisodeFile.getAbsoluteURL" length="$EpisodeFile.getAbsoluteSize" type="$getMime" />
-	<guid>$EpisodeLink</guid><%end_if %>
+	<guid>$EpisodeLink</guid><% end_if %>
 	<% if $EpisodeDate %><pubDate>$EpisodeDate.Rfc822</pubDate><% else %><pubDate>$Created.Rfc822</pubDate><% end_if %>
 	<% if $EpisodeDuration %><itunes:duration>$EpisodeDuration</itunes:duration><% end_if %>
 	<% if $BlockEpisode %><itunes:block>yes</itunes:block><% end_if %>
 	<% if $ExplicitEpisode %><itunes:explicit>$ExplicitEpisode</itunes:explicit><% end_if %>
 </item>
 <% end_loop %><% end_if %>
+<% end_cached %>
 </channel>
-</rss>
\ No newline at end of file
+</rss>