From 8823ec1d16cafa0b153e383e081be418edbb689a Mon Sep 17 00:00:00 2001
From: toidinamai <toidinamai@31f61c52-7bfb-0310-b897-fc00f8a278f0>
Date: Tue, 10 Jan 2006 21:53:19 +0000
Subject: [PATCH] Atom-ID fixed and misc whitespace fixes.

git-svn-id: svn://svn.c3d2.de/c3d2-web/branches/toidinamais_coole_scheisse@105 31f61c52-7bfb-0310-b897-fc00f8a278f0
---
 xsl/atom.xsl   | 15 ++++++++-------
 xsl/date.xsl   | 28 ++++++++++++++--------------
 xsl/header.xsl |  8 ++++----
 xsl/rss.xsl    | 12 ++++++------
 xsl/xhtml.xsl  | 22 +++++++++++-----------
 5 files changed, 43 insertions(+), 42 deletions(-)

diff --git a/xsl/atom.xsl b/xsl/atom.xsl
index ace2d6fe0..3de055290 100644
--- a/xsl/atom.xsl
+++ b/xsl/atom.xsl
@@ -1,14 +1,15 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   xmlns:date="http://exslt.org/dates-and-times"
+  xmlns:crypto="http://exslt.org/crypto"
   exclude-result-prefixes="xsl">
 
 <xsl:include href="common.xsl" />
-  
-<xsl:output method="xml" 
-            version="1.0" 
-            encoding="utf-8" 
+
+<xsl:output method="xml"
+            version="1.0"
+            encoding="utf-8"
             indent="yes"/>
 
   <xsl:template match="news">
@@ -29,7 +30,7 @@
         <xsl:sort select="date:seconds(@date)" data-type="number" order="descending" />
 
         <entry>
-          <id><xsl:value-of select="generate-id(current())"/></id>
+          <id><xsl:value-of select="crypto:sha1(concat(@title,@date))"/></id>
           <title><xsl:value-of select="@title"/></title>
           <updated><xsl:value-of select="@date"/></updated>
           <author>
diff --git a/xsl/date.xsl b/xsl/date.xsl
index faee4a319..483f09476 100644
--- a/xsl/date.xsl
+++ b/xsl/date.xsl
@@ -27,11 +27,11 @@
   <xsl:variable name="fourhundred">
     <xsl:value-of select="floor($year div 400)" />
   </xsl:variable>
-  
+
   <xsl:value-of select="$four - $hundred + $fourhundred - 477" />
 </xsl:template>
 
-<xsl:template name="correct-seconds"> 
+<xsl:template name="correct-seconds">
   <!-- Berechnet die Sekunden die vergangen wären, wenn es keine Schaltjahre gäbe -->
   <xsl:param name="seconds" />
 
@@ -52,7 +52,7 @@
   <xsl:variable name="year">
     <xsl:value-of select="floor($secondscorrected div (86400 * 365)) + 1970" />
   </xsl:variable>
-  
+
   <xsl:variable name="isleap">
     <xsl:call-template name="isleap">
       <xsl:with-param name="year" select="$year" />
@@ -77,7 +77,7 @@
 
 <xsl:template name="get-days">
   <xsl:param name="seconds" />
-  
+
   <xsl:variable name="secondscorrected">
     <xsl:call-template name="correct-seconds">
       <xsl:with-param name="seconds" select="$seconds"/>
@@ -102,13 +102,13 @@
 
 <xsl:template name="get-month">
   <xsl:param name="seconds" />
-  
+
   <xsl:variable name="year">
     <xsl:call-template name="get-year">
       <xsl:with-param name="seconds" select="$seconds"/>
     </xsl:call-template>
   </xsl:variable>
-  
+
   <xsl:variable name="isleap">
     <xsl:call-template name="isleap">
       <xsl:with-param name="year" select="$year" />
@@ -125,7 +125,7 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
-  
+
   <xsl:variable name="days">
     <xsl:call-template name="get-days">
       <xsl:with-param name="seconds" select="$seconds" />
@@ -180,7 +180,7 @@
       <xsl:with-param name="seconds" select="$seconds"/>
     </xsl:call-template>
   </xsl:variable>
-  
+
   <xsl:variable name="isleap">
     <xsl:call-template name="isleap">
       <xsl:with-param name="year" select="$year" />
@@ -197,7 +197,7 @@
       </xsl:otherwise>
     </xsl:choose>
   </xsl:variable>
-  
+
   <xsl:variable name="days">
     <xsl:call-template name="get-days">
       <xsl:with-param name="seconds" select="$seconds" />
@@ -248,7 +248,7 @@
 <xsl:template name="get-dayofweek">
   <!-- 1 entspricht Montag -->
   <xsl:param name="seconds" />
-  
+
   <!-- 1. Januar 1970 war ein Donnerstag -->
   <xsl:value-of select="(floor($seconds div 86400) + 3) mod 7 + 1" />
 </xsl:template>
@@ -297,7 +297,7 @@
       <xsl:with-param name="seconds" select="$seconds" />
     </xsl:call-template>
   </xsl:variable>
-  
+
   <xsl:choose>
     <xsl:when test="$month = 1">Januar</xsl:when>
     <xsl:when test="$month = 2">Februar</xsl:when>
@@ -313,14 +313,14 @@
     <xsl:when test="$month = 12">Dezember</xsl:when>
   </xsl:choose>
 </xsl:template>
- 
+
 <xsl:template name="get-datestring">
    <xsl:param name="date" />
 
    <xsl:variable name="seconds">
      <xsl:value-of select="date:seconds($date)" />
    </xsl:variable>
-      
+
    <xsl:variable name="year">
      <xsl:call-template name="get-year">
        <xsl:with-param name="seconds" select="$seconds" />
@@ -344,7 +344,7 @@
        <xsl:with-param name="seconds" select="$seconds" />
      </xsl:call-template>
    </xsl:variable>
-   
+
    <xsl:variable name="timestring">
      <xsl:call-template name="get-timestring">
        <xsl:with-param name="seconds" select="$seconds" />
diff --git a/xsl/header.xsl b/xsl/header.xsl
index 59b936aab..a8f8a3340 100644
--- a/xsl/header.xsl
+++ b/xsl/header.xsl
@@ -12,7 +12,7 @@
   <meta name="language" content="de" />
   <meta name="author" content="Fnordic walker" />
   <meta name="date" content="Jan 1 1970" />
-  
+
   <meta name="DC.Creator" content="Fnordic walker" />
   <meta name="DC.Description" content="&lt;&lt;&lt;/&gt;&gt; c3d2, der Erfahrungsaustauschkreis aus dem sächsischen Dresden" />
   <meta name="DC.Publisher" content="Chaos Computer Club Dresden" />
@@ -20,13 +20,13 @@
   <meta name="DC.Type" content="Text" />
   <meta name="DC.Format" content="text/html" />
   <meta name="DC.Language" content="de" />
-  <meta name="DC.Coverage" content="Dresden" />    
+  <meta name="DC.Coverage" content="Dresden" />
   <meta name="DC.Title" content="c3d2: Chaos Computer Club Dresden" />
-  
+
   <link rel="icon" href="" type="image/png" />
   <link rel="alternate" type="application/rss+xml" title="RSS 2.0" href="news-rss.xml" />
   <link rel="stylesheet" title="Default" type="text/css" href="style/default.css" />
-  
+
   <title>&lt;&lt;&lt;/&gt;&gt; Chaos Computer Club Dresden | c3d2</title>
   </xsl:template>
 
diff --git a/xsl/rss.xsl b/xsl/rss.xsl
index a62137337..9b48bcbe7 100644
--- a/xsl/rss.xsl
+++ b/xsl/rss.xsl
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
   exclude-result-prefixes="xsl">
-  
-<xsl:output method="xml" 
-            version="1.0" 
-            encoding="utf-8" 
+
+<xsl:output method="xml"
+            version="1.0"
+            encoding="utf-8"
             indent="yes"/>
 
   <xsl:template match="news">
diff --git a/xsl/xhtml.xsl b/xsl/xhtml.xsl
index 38e739930..0cbcc4090 100644
--- a/xsl/xhtml.xsl
+++ b/xsl/xhtml.xsl
@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
-<xsl:stylesheet version="1.0" 
-  xmlns:xsl="http://www.w3.org/1999/XSL/Transform" 
-  xmlns:rss="http://purl.org/rss/1.0/" 
+<xsl:stylesheet version="1.0"
+  xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
+  xmlns:rss="http://purl.org/rss/1.0/"
   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
   xmlns:date="http://exslt.org/dates-and-times"
   exclude-result-prefixes="xsl rss rdf">
@@ -11,9 +11,9 @@
 <xsl:include href="header.xsl" />
 <xsl:include href="footer.xsl" />
 
-<xsl:output method="xml" 
-            version="1.0" 
-            encoding="utf-8" 
+<xsl:output method="xml"
+            version="1.0"
+            encoding="utf-8"
             doctype-public="-//W3C//DTD XHTML 1.0 Strict//EN"
             doctype-system="DTD/xhtml1-strict.dtd"
             indent="yes"/>
@@ -39,18 +39,18 @@
 
           <div id="body">
 
-          <!-- ### Navigation ### -->      
+          <!-- ### Navigation ### -->
           <xsl:comment>
             <xsl:text> ### Navigation ### </xsl:text>
           </xsl:comment>
           <div id="navigation">
 
-          <!-- ### Search ### --> 
+          <!-- ### Search ### -->
           <xsl:comment>
             <xsl:text> ### Search ### </xsl:text>
           </xsl:comment>
 
-          <form action="http://www.google.de/custom" method="get"> 
+          <form action="http://www.google.de/custom" method="get">
             <p>
               <input type="text" name="q" size="20" value="c3d2" />
               <input type="hidden" name="domains" value="c3d2.de" />
@@ -147,7 +147,7 @@
       <h3 class="news"><xsl:value-of select="@title"/></h3>
 
       <small class="news_author">
-        <xsl:value-of select="@author"/> 
+        <xsl:value-of select="@author"/>
       </small>
 
       <xsl:variable name="datestring">
@@ -214,7 +214,7 @@
           <xsl:attribute name="title"><xsl:value-of select="document(concat('../content/', $file, '.xml'))/page/@pagetitle"/></xsl:attribute>
         </xsl:if>
         <xsl:value-of select="document(concat('../content/', $file, '.xml'))/page/@title"/>
-      </xsl:element>  
+      </xsl:element>
     </li>
   </xsl:template>