re-enable feed validation

This commit is contained in:
Astro 2011-11-14 02:38:26 +01:00
parent 02ce095486
commit 79d7a2f842
4 changed files with 28 additions and 36 deletions

View File

@ -105,34 +105,27 @@ $(DATESTAMP):
build/%.html : NOVALID:=true
build/news.html: $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DATESTAMP)
build/news-rss.xml : STYLE=xsl/rss.xsl
build/news-rss.xml : NOVALID:=true
build/news-rss.xml : PFLAGS+=--stringparam prefix ""
build/news-rss.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
build/news-atom.xml : STYLE=xsl/atom.xsl
build/news-atom.xml : NOVALID:=true
build/news-atom.xml : PFLAGS+=--stringparam prefix ""
build/news-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
build/podcast.xml : STYLE=xsl/podcast.xsl
build/podcast.xml : NOVALID:=true
build/podcast.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
build/podcast.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
build/pentaradio.xml : STYLE=xsl/podcast.xsl
build/pentaradio.xml : NOVALID:=true
build/pentaradio.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
build/pentaradio.xml : PFLAGS+=--stringparam selection pentaradio
build/pentaradio.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
build/pentacast.xml : STYLE=xsl/podcast.xsl
build/pentacast.xml : NOVALID:=true
build/pentacast.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
build/pentacast.xml : PFLAGS+=--stringparam selection pentacast
build/pentacast.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
build/pentamusic.xml : STYLE=xsl/podcast.xsl
build/pentamusic.xml : NOVALID:=true
build/pentamusic.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
build/pentamusic.xml : PFLAGS+=--stringparam selection pentamusic
build/pentamusic.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?
build/pentamedia.xml : STYLE=xsl/podcast.xsl
build/pentamedia.xml : NOVALID:=true
build/pentamedia.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
build/pentamedia.xml : PFLAGS+=--stringparam selection pentamedia
build/pentamedia.xml: xsl/podcast.xsl # Does not work with $(STYLE) - why?

View File

@ -55,7 +55,7 @@
<xs:element name="author" type="emailType" minOccurs="0"/>
<xs:element name="category" type="categoryType" minOccurs="0"/>
<xs:element name="comments" type="xs:anyURI" minOccurs="0"/>
<xs:element name="enclosure" type="enclosureType" minOccurs="0"/>
<xs:element name="enclosure" type="enclosureType" minOccurs="0" maxOccurs="unbounded"/>
<xs:element name="guid" type="guidType" minOccurs="0"/>
<xs:element name="pubDate" type="rfc822Type" minOccurs="0"/>
<xs:element name="source" type="sourceType" minOccurs="0"/>

View File

@ -169,8 +169,7 @@
<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="author" select="../@author"/>
<xsl:with-param name="date" select="../@date"/>
<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"/>
@ -190,8 +189,7 @@
<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="author" select="../../@author"/>
<xsl:with-param name="date" select="../../@date"/>
<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"/>
@ -202,7 +200,6 @@
<xsl:param name="newsfile"/>
<xsl:param name="item_title"/>
<xsl:param name="resource_title"/>
<xsl:param name="author"/>
<xsl:param name="date"/>
<xsl:param name="resource_url"/>
<xsl:param name="resource_size"/>
@ -216,6 +213,13 @@
</xsl:variable>
<title><xsl:value-of select="$item_title"/></title>
<description>
<xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
<div xmlns="http://www.w3.org/1999/xhtml">
<xsl:apply-templates select="document($newsfile)/item/*[name() != 'resource']"/>
</div>
<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
</description>
<link><xsl:value-of select="$href"/></link>
<enclosure
@ -232,13 +236,6 @@
</xsl:call-template>
</pubDate>
<description>
<xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
<div xmlns="http://www.w3.org/1999/xhtml">
<xsl:apply-templates select="document($newsfile)/item/*[name() != 'resource']"/>
</div>
<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
</description>
<content:encoded>
<xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
<div xmlns="http://www.w3.org/1999/xhtml">

View File

@ -59,16 +59,10 @@
</div>
<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
</description>
<content:encoded>
<xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
<div xmlns="http://www.w3.org/1999/xhtml">
<xsl:apply-templates select="document($newsfile)/item/*"/>
</div>
<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
</content:encoded>
<link><xsl:value-of select="$href"/></link>
<author><xsl:value-of select="@author"/></author>
<author><xsl:value-of select="translate(@author, 'ABCDEFGHIJKLMNOPQRSTUVWXYZ',
'abcdefghijklmnopqrstuvwxyz')"/>@c3d2.de</author>
<xsl:choose>
<xsl:when test="starts-with($newsfile, 'content/news/ta-')">
@ -82,13 +76,6 @@
</xsl:otherwise>
</xsl:choose>
<guid isPermaLink="true"><xsl:value-of select="$href"/></guid>
<pubDate>
<xsl:call-template name="date-to-rfc822">
<xsl:with-param name="date" select="@date"/>
</xsl:call-template>
</pubDate>
<!--
TODO:
Jemand mit iTunes (erhältlich für OSX und Windows)
@ -106,6 +93,21 @@
length="{@size}"
type="{@type}" />
</xsl:for-each>
<guid isPermaLink="true"><xsl:value-of select="$href"/></guid>
<pubDate>
<xsl:call-template name="date-to-rfc822">
<xsl:with-param name="date" select="@date"/>
</xsl:call-template>
</pubDate>
<content:encoded>
<xsl:text disable-output-escaping="yes">&lt;![CDATA[</xsl:text>
<div xmlns="http://www.w3.org/1999/xhtml">
<xsl:apply-templates select="document($newsfile)/item/*"/>
</div>
<xsl:text disable-output-escaping="yes">]]&gt;</xsl:text>
</content:encoded>
</item>
</xsl:template>