mv datenspuren datenspuren/2011

Makefile

@@ -32,6 +32,7 @@ DESTDIR?=www-export
 # XSLT-Stylesheets:
 STYLE=xsl/xhtml5.xsl
 DS_STYLE=xsl/datenspuren/xhtml5.xsl
+DS_YEAR=2011
 # Document-Type-Definition:
 DTD:=dtd/c3d2web.dtd
 # XML-Katalog (Pfad zu den DTDs) - wird benötigt vom Validator
@@ -43,7 +44,7 @@ WWW_CCC_DE_UPDATES=chaosupdates.xml
 # Calendar summary::
 CALENDAR_SUMMARY=calendar-summary.xml
 # Datenspuren Fahrplan
-DS_SCHEDULE=$(wildcard content/static/datenspuren/fahrplan/day/*.html)
+DS_SCHEDULE=$(wildcard content/static/datenspuren/$(DS_YEAR)/fahrplan/day/*.html)
 
 ### Ziele ###
 # Mindestens 1x täglich neubauen wegen Chaosupdates & Kalender
@@ -59,12 +60,12 @@ NEWS_PAGES:=$(patsubst content/news/%.xml, build/news/%.html, $(wildcard content
 # News-Index und Feeds:
 NEWSFILES:=build/news.html build/news-rss.xml build/news-atom.xml \
 	build/podcast.xml build/pentaradio.xml build/pentacast.xml build/pentamusic.xml build/pentamedia.xml \
-	build/ical.ics build/xcal.xml build/reminders build/datenspuren/news-rss.xml build/datenspuren/news-atom.xml
+	build/ical.ics build/xcal.xml build/reminders build/datenspuren/$(DS_YEAR)/news-rss.xml build/datenspuren/$(DS_YEAR)/news-atom.xml
 PLAYLISTS:=$(patsubst content/news/pentaradio%.xml, build/news/pentaradio%.xspf, $(wildcard content/news/pentaradio*.xml)) \
 	$(patsubst content/news/pentaradio%.xml, build/news/pentaradio%.pls, $(wildcard content/news/pentaradio*.xml)) \
 	$(patsubst content/news/pentaradio%.xml, build/news/pentaradio%.m3u, $(wildcard content/news/pentaradio*.xml))
 # Datenspuren-Seiten:
-DS_PAGES:=$(patsubst content/datenspuren/%.xml, build/datenspuren/%.html, $(wildcard content/datenspuren/*.xml))
+DS_PAGES:=$(patsubst content/datenspuren/%.xml, build/datenspuren/$(DS_YEAR)/%.html, $(wildcard content/datenspuren/*.xml))
 
 # Quellen
 NEWSITEMS:=$(wildcard content/news/*.xml)
@@ -190,20 +191,20 @@ build/news/%.html : BASEURL="../"
 build/news/%.html: content/news/%.xml $(STYLE) $(NAVIGATION) $(WWW_CCC_DE_UPDATES) $(CALENDAR_SUMMARY) $(DATESTAMP)
 	$(call xml_process)
 
-build/datenspuren/%html : STYLE=$(DS_STYLE)
-build/datenspuren/%.html: content/datenspuren/%.xml $(DS_STYLE) news.xml $(DS_SCHEDULE)
+build/datenspuren/$(DS_YEAR)/%html : STYLE=$(DS_STYLE)
+build/datenspuren/$(DS_YEAR)/%.html: content/datenspuren/%.xml $(DS_STYLE) news.xml $(DS_SCHEDULE)
 	$(call xml_process)
 
-build/datenspuren/schedule.html : content/static/datenspuren/fahrplan/index.de.html
+build/datenspuren/$(DS_YEAR)/schedule.html : content/static/datenspuren/$(DS_YEAR)/fahrplan/index.de.html
 
-build/datenspuren/news-rss.xml : STYLE=xsl/rss.xsl
-build/datenspuren/news-rss.xml : NOVALID:=true
-build/datenspuren/news-rss.xml : PFLAGS+=--stringparam prefix ds11-
-build/datenspuren/news-rss.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
-build/datenspuren/news-atom.xml : STYLE=xsl/atom.xsl
-build/datenspuren/news-atom.xml : NOVALID:=true
-build/datenspuren/news-atom.xml : PFLAGS+=--stringparam prefix ds11-
-build/datenspuren/news-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
+build/datenspuren/$(DS_YEAR)/news-rss.xml : STYLE=xsl/rss.xsl
+build/datenspuren/$(DS_YEAR)/news-rss.xml : NOVALID:=true
+build/datenspuren/$(DS_YEAR)/news-rss.xml : PFLAGS+=--stringparam prefix ds11-
+build/datenspuren/$(DS_YEAR)/news-rss.xml : VFLAGS_OUT=$(VFLAGS) --schema xsd/rss20.xsd
+build/datenspuren/$(DS_YEAR)/news-atom.xml : STYLE=xsl/atom.xsl
+build/datenspuren/$(DS_YEAR)/news-atom.xml : NOVALID:=true
+build/datenspuren/$(DS_YEAR)/news-atom.xml : PFLAGS+=--stringparam prefix ds11-
+build/datenspuren/$(DS_YEAR)/news-atom.xml : VFLAGS_OUT=$(VFLAGS) --relaxng xsd/atom.rng
 
 xhtml5-validate: $(patsubst build/%.html, build/%.html.xhtml5-validate, $(CONTENT))
 build/%.html.xhtml5-validate: build/%.html

content/datenspuren/fahrplan.xml

@@ -2,6 +2,6 @@
 <!DOCTYPE page SYSTEM "http://www.c3d2.de/dtd/c3d2web.dtd">
 
 <page title="Fahrplan">
-  <include-pentabarf-schedule src="../static/datenspuren/fahrplan/day_2011-10-15.de.html"/>
-  <include-pentabarf-schedule src="../static/datenspuren/fahrplan/day_2011-10-16.de.html"/>
+  <include-pentabarf-schedule src="../static/datenspuren/2011/fahrplan/day_2011-10-15.de.html"/>
+  <include-pentabarf-schedule src="../static/datenspuren/2011/fahrplan/day_2011-10-16.de.html"/>
 </page>