From 100f6aec4e1b3acc3cf610c3799ea1f08002816a Mon Sep 17 00:00:00 2001
From: astro <astro@31f61c52-7bfb-0310-b897-fc00f8a278f0>
Date: Fri, 13 Nov 2009 22:44:05 +0000
Subject: [PATCH] chaosupdates.xml von anderer Stelle

git-svn-id: svn://svn.c3d2.de/c3d2-web/trunk@2231 31f61c52-7bfb-0310-b897-fc00f8a278f0
---
 Makefile       | 9 ++++++---
 xsl/common.xsl | 6 +++---
 2 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 020495429..c6b1a6000 100644
--- a/Makefile
+++ b/Makefile
@@ -39,7 +39,7 @@ XML_CATALOG:=dtd/catalog.xml
 # Navigationsleiste:
 NAVIGATION=content/navigation.xml
 # Chaosupdates:
-WWW_CCC_DE_UPDATES=chaosupdates.rdf
+WWW_CCC_DE_UPDATES=chaosupdates.xml
 # Calendar summary::
 CALENDAR_SUMMARY=calendar-summary.xml
 
@@ -197,9 +197,12 @@ build/datenspuren/news-atom.xml : PFLAGS+=--stringparam prefix ds09-
 build/datenspuren/news-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
 
 ### Die neuesten Chaosupdates holen ###
-$(WWW_CCC_DE_UPDATES): $(DATESTAMP)
+$(WWW_CCC_DE_UPDATES).orig: $(DATESTAMP)
 	$(RM) $@
-	$(WGET) -O $@ http://www.ccc.de/updates/$(WWW_CCC_DE_UPDATES)
+	$(WGET) -O $@ http://www.ccc.de/en/rss/updates
+
+$(WWW_CCC_DE_UPDATES): $(WWW_CCC_DE_UPDATES).orig
+	$(VALIDATOR) --recover $< > $@
 
 ### Mr. Propper ###
 .PHONY: clean
diff --git a/xsl/common.xsl b/xsl/common.xsl
index cae0a0d1d..55e6f2b0b 100644
--- a/xsl/common.xsl
+++ b/xsl/common.xsl
@@ -155,12 +155,12 @@
     <xsl:param name="limit" select="5"/>
     <div id="news">
       <h2>
-        <a href="{document('../chaosupdates.rdf')/atom:feed/atom:link[@rel != 'self']/@href}">
-          <xsl:value-of select="document('../chaosupdates.rdf')/atom:feed/atom:title"/>
+        <a href="{document('../chaosupdates.xml')/atom:feed/atom:link[@rel != 'self']/@href}">
+          <xsl:value-of select="document('../chaosupdates.xml')/atom:feed/atom:title"/>
         </a>
       </h2>
       <ul>
-        <xsl:for-each select="document('../chaosupdates.rdf')/atom:feed/atom:entry[position() &lt;= $limit]">
+        <xsl:for-each select="document('../chaosupdates.xml')/atom:feed/atom:entry[position() &lt;= $limit]">
           <li>
             <a href="{atom:link[@rel = 'alternate']/@href}">
               <xsl:value-of select="atom:title"/>