From ece908a4c1373a10f0de9d2cf26130a928320b02 Mon Sep 17 00:00:00 2001
From: Astro <astro@spaceboyz.net>
Date: Tue, 1 Apr 2014 23:01:28 +0200
Subject: [PATCH] Revert "Revert "don't publish news items with future @date""

This reverts commit 581f0be64f6648c450876135cec92e0071d37771.

Conflicts:
	documentation/conventions.md
---
 documentation/conventions.md |  5 ++++-
 documentation/todo.md        |  4 ----
 xsl/atom.xsl                 |  4 ++--
 xsl/portal2items.xsl         | 36 ++++++++++++++++--------------------
 xsl/rss.xsl                  |  4 ++--
 xsl/xhtml5.xsl               | 21 +++++++++++++++++++--
 6 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/documentation/conventions.md b/documentation/conventions.md
index 91394b46c..43fec250d 100644
--- a/documentation/conventions.md
+++ b/documentation/conventions.md
@@ -10,7 +10,6 @@ XSL-Stylesheet
  - Begründung: Ermöglicht Transformation in verschiedene Formate durch Angabe des entsprechenden XSL-Stylesheets
                (z.B. item-XML-Datei in HTML oder alternativ in RSS transformieren) 
 
-
 # Features
 
 Podcast-Einbettung
@@ -42,3 +41,7 @@ Kommentare:
 MUC:
  - Integration mit Nick input + Submit button
  - Vielleicht auch iframe?
+
+## news pre-posting
+
+some news shall be written right now but published later, thats why the date next to author of the news/events item etc. should be compared and if greater than the current one not considered for publication yet.
diff --git a/documentation/todo.md b/documentation/todo.md
index bd5de90a6..748f4b135 100644
--- a/documentation/todo.md
+++ b/documentation/todo.md
@@ -1,9 +1,5 @@
 = was man noch machen könnte
 
-== news pre-posting
-
-some news shall be written right now but published later, thats why the date next to author of the news/events item etc. should be compared and if greater than the current one not considered for publication yet.
-
 == potal-mediagoblin
 
 eine option für das bekanntgeben eines neuen Bilcdes fehlt im Mediagobline. Derzeit werden alle Bilder von bestimmten Nutzern (john, astro, lachmoewe, bigalex) bekannt gegeben.. nuja.
diff --git a/xsl/atom.xsl b/xsl/atom.xsl
index 37098d652..dc06cc92a 100644
--- a/xsl/atom.xsl
+++ b/xsl/atom.xsl
@@ -41,8 +41,8 @@
         <xsl:sort select="date:seconds(document(.)/item/@date)" data-type="number" order="descending" />
         <xsl:variable name="newsfile" select="."/>
         <xsl:if test="(position() &lt;= $maxitems) and
-                      starts-with(substring-after(substring-after($newsfile, '/'), '/'), $prefix)">
-          
+                      starts-with(substring-after(substring-after($newsfile, '/'), '/'), $prefix) and
+                      starts-with(date:difference(date:date-time(), document(.)/item/@date), '-')">
           <xsl:for-each select="document($newsfile)/item">
             <xsl:call-template name="atom-entry">
               <xsl:with-param name="newsfile" select="$newsfile"/>
diff --git a/xsl/portal2items.xsl b/xsl/portal2items.xsl
index c76d30564..3ec3419e1 100644
--- a/xsl/portal2items.xsl
+++ b/xsl/portal2items.xsl
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <xsl:stylesheet version="1.0"
 		xmlns:atom="http://www.w3.org/2005/Atom"
+                xmlns:date="http://exslt.org/dates-and-times"
                 xmlns:xsl="http://www.w3.org/1999/XSL/Transform">
 <xsl:output method="xml" encoding="utf-8" indent="yes"/>
 
@@ -17,10 +18,13 @@
 
     <!-- Extract from news -->
     <xsl:for-each select="document('../news.xml')//newsfile">
-      <xsl:apply-templates select="document(concat('../', .))/item" mode="news">
-	<xsl:with-param name="link"
-			select="concat(substring-before(substring-after(., 'content/'), '.xml'), '.html')"/>
-      </xsl:apply-templates>
+      <xsl:if test="starts-with(date:difference(date:date-time(), @date), '-')">
+        <xsl:apply-templates select="document(concat('../', .))/item"
+                             mode="news">
+	  <xsl:with-param name="link"
+			  select="concat(substring-before(substring-after(., 'content/'), '.xml'), '.html')"/>
+        </xsl:apply-templates>
+      </xsl:if>
     </xsl:for-each>
   </portal>
 </xsl:template>
@@ -85,23 +89,15 @@
 </xsl:template>
 
 <xsl:template match="item" mode="news">
-	<xsl:param name="link"/>
+  <xsl:param name="link"/>
 
-	<!-- date cannot be compared (to current date) in xslt 1.0 without a param handed over -->
-	<!-- current-date() as of XSLT 2.0 -->
-	<!--
-	<xsl:if test="{@date}">
-	-->
-		<item date="{@date}" class="news">
-			<header>News</header>
-			<footer>by <xsl:value-of select="@author"/></footer>
-			<content-text><xsl:value-of select="@title"/></content-text>
-			<xsl:apply-templates select=".//image[1]" mode="news"/>
-			<link><xsl:value-of select="$link"/></link>
-		</item>
-	<!--
-	</xsl:if>
-	-->
+  <item date="{@date}" class="news">
+    <header>News</header>
+    <footer>by <xsl:value-of select="@author"/></footer>
+    <content-text><xsl:value-of select="@title"/></content-text>
+    <xsl:apply-templates select=".//image[1]" mode="news"/>
+    <link><xsl:value-of select="$link"/></link>
+  </item>
 </xsl:template>
 
 <xsl:template match="item/image[1]" mode="news">
diff --git a/xsl/rss.xsl b/xsl/rss.xsl
index 3806e2d50..0c2529032 100644
--- a/xsl/rss.xsl
+++ b/xsl/rss.xsl
@@ -39,8 +39,8 @@
           <xsl:sort select="date:seconds(document(.)/item/@date)" data-type="number" order="descending" />
           <xsl:variable name="newsfile" select="."/>
           <xsl:if test="(position() &lt;= $maxitems) and
-                        starts-with(substring-after(substring-after($newsfile, '/'), '/'), $prefix)">
-            
+                        starts-with(substring-after(substring-after($newsfile, '/'), '/'), $prefix) and
+                        starts-with(date:difference(date:date-time(), document(.)/item/@date), '-')">
             <xsl:apply-templates select="document(.)/item">
               <xsl:with-param name="newsfile" select="$newsfile"/>
             </xsl:apply-templates>
diff --git a/xsl/xhtml5.xsl b/xsl/xhtml5.xsl
index a5b6970d0..623898d99 100644
--- a/xsl/xhtml5.xsl
+++ b/xsl/xhtml5.xsl
@@ -135,7 +135,14 @@
 
     <xsl:for-each select="newsfile">
       <xsl:sort select="date:seconds(document(concat('../', .))/item/@date)" data-type="number" order="descending" />
-      <xsl:if test="position() &lt;= 10">
+      <xsl:if test="position() &lt;= 10 and
+                    not(starts-with(
+                      date:difference(
+                        document(concat('../', .))/item/@date,
+                        date:date-time()
+                      ),
+                      '-'
+                    ))">
   
         <xsl:variable name="newsfile"><xsl:value-of select="."/></xsl:variable>
         <xsl:variable name="itemposition" select="position()"/>
@@ -252,7 +259,17 @@
       <xsl:variable name="newsfile" select="."/>
 
       <xsl:for-each select="document(concat('../', $newsfile))/item">
-        <xsl:if test="((string-length($prefix) = 0) or starts-with($newsfile, concat('content/news/', $prefix))) and (($details != 'resources-only') or (count(resource) &gt; 0))">
+        <xsl:if test="((string-length($prefix) = 0) or
+                       starts-with($newsfile, concat('content/news/', $prefix))) and
+                      (($details != 'resources-only') or
+                      (count(resource) &gt; 0)) and
+                      starts-with(
+                        date:difference(
+                          document(concat('../', .))/item/@date,
+                          date:date-time()
+                        ),
+                        '-'
+                      )">
 
           <div>
             <xsl:if test="($details = 'event') and event">