From 38d224a335cb9935d186b8b7ad0dc39c768e364f Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Sat, 16 Mar 2013 09:42:13 +0200
Subject: Only print separator when really needed on import

The separator was printed if SITE had data, even if LOCATION was empty.
Now print the separator only if both of these contain data.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
---
 xslt/divelogs.xslt | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'xslt')

diff --git a/xslt/divelogs.xslt b/xslt/divelogs.xslt
index c0585a540..32a59c358 100644
--- a/xslt/divelogs.xslt
+++ b/xslt/divelogs.xslt
@@ -45,14 +45,8 @@
       </depth>
       <location>
         <xsl:for-each select="LOCATION|SITE">
-          <xsl:choose>
-            <xsl:when test="following-sibling::SITE[1] != ''">
-              <xsl:value-of select="concat(., ' / ')"/>
-            </xsl:when>
-            <xsl:otherwise>
-              <xsl:value-of select="."/>
-            </xsl:otherwise>
-          </xsl:choose>
+          <xsl:value-of select="."/>
+          <xsl:if test=". != '' and following-sibling::*[1] != ''"> / </xsl:if>
         </xsl:for-each>
       </location>
 
-- 
cgit v1.2.3-70-g09d2