From f1234d529246d3324b6e398db9806e9e0bb2312a Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Thu, 14 Oct 2010 22:27:09 +0200
Subject: [PATCH] datenspuren schedule xslfo: update for 2010

---
 xslfo/datenspuren/schedule/Makefile         | 12 ++++++++----
 xslfo/datenspuren/schedule/day_schedule.xsl |  3 +--
 xslfo/datenspuren/schedule/schedule-fo.xsl  |  5 ++---
 3 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/xslfo/datenspuren/schedule/Makefile b/xslfo/datenspuren/schedule/Makefile
index 24e0230e0..e994f9373 100644
--- a/xslfo/datenspuren/schedule/Makefile
+++ b/xslfo/datenspuren/schedule/Makefile
@@ -1,4 +1,4 @@
-EXPORT_DIR=../../../content/static/datenspuren/2009
+EXPORT_DIR=../../../content/static/datenspuren/fahrplan
 FOP=~/programs/fop/fop
 FOP_FLAGS=-d
 XSLT=xsltproc
@@ -6,14 +6,14 @@ XSLT_FLAGS=--novalid
 XEP=~/Java/XEP/xep
 
 
-FOP_FILES=day_2009-10-03.pdf day_2009-10-04.pdf
+FOP_FILES=day_2010-10-16.pdf day_2010-10-17.pdf
 
 all: $(FOP_FILES)
 
-day_%.de.html: $(EXPORT_DIR)/day_%.de.html
+day_%.de.html: $(EXPORT_DIR)/day/%.de.html
 	cp $< $@
 
-schedule.de.xml: $(EXPORT_DIR)/schedule.de.xml
+schedule.de.xml: $(EXPORT_DIR)/schedule.xml
 	cp $< $@
 
 day_%.xml: day_%.de.html day_schedule.xsl schedule.de.xml
@@ -51,6 +51,10 @@ day_%_hyphenated.xml: day_%.xml
 		-e 's/Datenpaketen/Da\&#173;ten\&#173;pa\&#173;ket\&#173;en/' \
 		-e 's/Optimierungsmöglichkeiten/Op\&#173;ti\&#173;mier\&#173;ungs\&#173;mög\&#173;lich\&#173;keiten/' \
 		-e 's/zivilgesellschaftliche/zi\&#173;vil\&#173;ge\&#173;sell\&#173;schaft\&#173;liche/' \
+		-e 's/Entwicklungspsychologie/Ent\&#173;wick\&#173;lungs\&#173;psy\&#173;cho\&#173;lo\&#173;gie/' \
+		-e 's/Demokratie/Demo\&#173;kra\&#173;tie/' \
+		-e 's/veranstaltung/\&#173;ver\&#173;an\&#173;stalt\&#173;ung/' \
+		-e 's/Arbeitspsychologischer/Ar\&#173;beits\&#173;psy\&#173;cho\&#173;lo\&#173;gisch\&#173;er/' \
 		< $< > $@
 	#cp $< $@
 
diff --git a/xslfo/datenspuren/schedule/day_schedule.xsl b/xslfo/datenspuren/schedule/day_schedule.xsl
index 145752ab3..1883ba366 100644
--- a/xslfo/datenspuren/schedule/day_schedule.xsl
+++ b/xslfo/datenspuren/schedule/day_schedule.xsl
@@ -53,8 +53,7 @@
 </xsl:template>
 
 <xsl:template match="x:tbody/x:tr/x:td[starts-with(@class,'room event ')]">
-  <!--xsl:variable name="id" select="substring-before(substring-after(p[@class='title']/a/@href, '/events/'), '.de.html')"/-->
-  <xsl:variable name="id" select="substring-before(substring-after(x:p[@class='title']/x:a/@href, 'events/'), '.de.html')"/>
+  <xsl:variable name="id" select="substring-before(substring-after(x:p[@class='title']/x:a/@href, 'event/'), '.de.html')"/>
 
   <event slots="{@rowspan}" id="{$id}">
     <xsl:copy-of select="document('schedule.de.xml')/schedule/day/room/event[@id=$id]/*"/>
diff --git a/xslfo/datenspuren/schedule/schedule-fo.xsl b/xslfo/datenspuren/schedule/schedule-fo.xsl
index dbfa5a4c0..00e2bea71 100644
--- a/xslfo/datenspuren/schedule/schedule-fo.xsl
+++ b/xslfo/datenspuren/schedule/schedule-fo.xsl
@@ -27,11 +27,10 @@
     <page-sequence master-reference="FullPage">
       <flow flow-name="xsl-region-body" font-size="14pt">
 
-        <block text-align="right" font-size="8pt">
+        <!--block text-align="right" font-size="8pt">
           Release <xsl:value-of select="@version"/>,
-          <!--xsl:value-of select="concat(date:day-in-month(@ctime),'.',date:month-in-year(@ctime),'.',date:year(@ctime),' ',date:hour-in-day(@ctime),':',date:minute-in-hour(@ctime),':',date:second-in-minute(@ctime))"/-->
           <xsl:value-of select="concat(date:day-in-month(@ctime),'.',date:month-in-year(@ctime),'.',date:year(@ctime),' ',date:time(@ctime))"/>
-        </block>
+        </block-->
 
         <xsl:apply-templates select="title"/>
         <xsl:apply-templates select="subtitle"/>