From 6bf9cf7262826246a12c60c6a4276509ffd7abab Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Sun, 22 Oct 2017 23:02:32 +0200
Subject: [PATCH] ds17 videos: fix urls + metadata

---
 Makefile                   | 4 ++--
 xsl/datenspuren/xhtml5.xsl | 6 ++----
 2 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/Makefile b/Makefile
index 2311297ee..ada69bc93 100644
--- a/Makefile
+++ b/Makefile
@@ -295,9 +295,9 @@ datenspuren-2016-mp3.xml:
 	$(WGET) -O $@ https://media.ccc.de/c/ds2016/podcast/mp3.xml
 
 datenspuren-2017-mp4.xml:
-	$(WGET) -O $@ https://media.ccc.de/c/DS2017/podcast/mp4.xml
+	$(WGET) -O $@ https://media.ccc.de/c/DS2017/podcast/mp4-hq.xml
 datenspuren-2017-webm.xml:
-	$(WGET) -O $@ https://media.ccc.de/c/DS2017/podcast/webm.xml
+	$(WGET) -O $@ https://media.ccc.de/c/DS2017/podcast/webm-hq.xml
 datenspuren-2017-opus.xml:
 	$(WGET) -O $@ https://media.ccc.de/c/DS2017/podcast/opus.xml
 datenspuren-2017-mp3.xml:
diff --git a/xsl/datenspuren/xhtml5.xsl b/xsl/datenspuren/xhtml5.xsl
index a65c721a6..bf46939f9 100644
--- a/xsl/datenspuren/xhtml5.xsl
+++ b/xsl/datenspuren/xhtml5.xsl
@@ -258,15 +258,13 @@
     <xsl:for-each select="feed[1]">
       <xsl:for-each select="document(.)/rss/channel/item">
         <xsl:variable name="identifier" select="dc:identifier"/>
-        <xsl:variable name="slug"
-                      select="substring-before(substring-after(description, 'event on media: //media.ccc.de/'), '.html')"/>
-        <xsl:variable name="title" select="substring-before(title, concat(' (ds', $year, ')'))"/>
+        <xsl:variable name="title" select="substring-before(title, concat(' (DS', $year, ')'))"/>
         <xsl:variable name="preview"
                       select="concat('https://static.media.ccc.de/media/events/datenspuren/', $year, '/', substring-before(substring-after(link, concat('/DS', $year, '-')), '-'), '-hd.jpg')"/>
 
         <section class="resource">
           <h4>
-            <a href="https://media.ccc.de/v/{$slug}">
+            <a href="{link}">
               <xsl:value-of select="$title"/>
             </a>
           </h4>