From 2936aa6aa0b76dce666f3d6c9f9f628d4f6b910a Mon Sep 17 00:00:00 2001
From: Miika Turkia <miika.turkia@gmail.com>
Date: Tue, 16 Feb 2021 18:31:56 +0200
Subject: Use country for divelogs.de export

This will use only the country name for the location field in
divelogs.de export. The old version concatenated all the fields
together. This is inline with Rainer's new import functionality.

Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
---
 xslt/divelogs-export.xslt | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/xslt/divelogs-export.xslt b/xslt/divelogs-export.xslt
index eaa1c510c..1bcf6e057 100644
--- a/xslt/divelogs-export.xslt
+++ b/xslt/divelogs-export.xslt
@@ -42,6 +42,17 @@
       <xsl:value-of select="//site[@uuid = $uuid]/@name"/>
     </xsl:variable>
     <xsl:choose>
+      <xsl:when test="/divelog/divesites/site[@uuid = $uuid]/geo/@value != ''">
+        <LOCATION>
+          <xsl:for-each select="/divelog/divesites/site[@uuid = $uuid]/geo/@value">
+            <xsl:if test="position() != 1"> / </xsl:if>
+            <xsl:value-of select="."/>
+          </xsl:for-each>
+        </LOCATION>
+        <SITE>
+          <xsl:value-of select="$location"/>
+        </SITE>
+      </xsl:when>
       <xsl:when test="contains($location, '/')">
         <xsl:variable name="site">
           <xsl:call-template name="basename">
@@ -56,17 +67,6 @@
         </LOCATION>
       </xsl:when>
       <xsl:otherwise>
-        <xsl:if test="/divelog/divesites/site[@uuid = $uuid]/geo/@value != ''">
-          <LOCATION>
-            <xsl:for-each select="/divelog/divesites/site[@uuid = $uuid]/geo/@value">
-              <xsl:if test="position() != 1"> / </xsl:if>
-              <xsl:value-of select="."/>
-            </xsl:for-each>
-          </LOCATION>
-        </xsl:if>
-        <SITE>
-          <xsl:value-of select="$location"/>
-        </SITE>
       </xsl:otherwise>
     </xsl:choose>
 
-- 
cgit v1.2.3-70-g09d2