From 63821c54020bc0ed9db48b6676487e0f105beb65 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Mon, 14 Nov 2011 02:45:05 +0100
Subject: [PATCH] podcast feed: fix & enhance item titles (in case of multiple
 items per news)

---
 xsl/podcast.xsl | 38 +++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 23 deletions(-)

diff --git a/xsl/podcast.xsl b/xsl/podcast.xsl
index 2a7ddc3ac..1b64089b0 100644
--- a/xsl/podcast.xsl
+++ b/xsl/podcast.xsl
@@ -156,7 +156,7 @@
     </xsl:choose>
   </xsl:template>
 
-  <xsl:template match="resource">
+  <xsl:template match="*[name() = 'resource' or name() = 'alternative']">
     <xsl:param name="newsfile"/>
 
     <xsl:variable name="href">
@@ -167,28 +167,20 @@
 
     <xsl:call-template name="generate-item">
       <xsl:with-param name="newsfile" select="$newsfile"/>
-      <xsl:with-param name="item_title" select="../@title"/>
-      <xsl:with-param name="resource_title" select="@title"/>
-      <xsl:with-param name="date" select="document($newsfile)/item/@date"/>
-      <xsl:with-param name="resource_url" select="$href"/>
-      <xsl:with-param name="resource_size" select="@size"/>
-      <xsl:with-param name="resource_type" select="@type"/>
-    </xsl:call-template>
-  </xsl:template>
-
-  <xsl:template match="alternative">
-    <xsl:param name="newsfile"/>
-
-    <xsl:variable name="href">
-      <xsl:call-template name="make-href">
-        <xsl:with-param name="href" select="@url"/>
-      </xsl:call-template>
-    </xsl:variable>
-
-    <xsl:call-template name="generate-item">
-      <xsl:with-param name="newsfile" select="$newsfile"/>
-      <xsl:with-param name="item_title" select="../../@title"/>
-      <xsl:with-param name="resource_title" select="../@title"/>
+      <xsl:with-param name="item_title">
+	<xsl:value-of select="document($newsfile)/item/@title"/>
+	<xsl:if test="count(document($newsfile)//resource) &gt; 1 and @title">
+	  <!-- Multiple resources in this item? -->
+	  <xsl:text>: </xsl:text>
+	  <xsl:value-of select="@title"/>
+	</xsl:if>
+      </xsl:with-param>
+      <xsl:with-param name="resource_title">
+	<xsl:choose>
+	  <xsl:when test="@title"><xsl:value-of select="@title"/></xsl:when>
+	  <xsl:otherwise><xsl:value-of select="../@title"/></xsl:otherwise>
+	</xsl:choose>
+      </xsl:with-param>
       <xsl:with-param name="date" select="document($newsfile)/item/@date"/>
       <xsl:with-param name="resource_url" select="$href"/>
       <xsl:with-param name="resource_size" select="@size"/>