diff options
| author |  Miika Turkia <miika.turkia@gmail.com> | 2015-05-20 21:45:56 +0300 |
|---|---|---|
| committer |  Dirk Hohndel <dirk@hohndel.org> | 2015-05-21 08:47:29 -0700 |
| commit | 95c2c06be440be62850ae06d201e55aa28415085 (patch) | |
| tree | 912290749b3291df6c8da0445660a64d64d28c80 | |
| parent | f7e86b58386f36bdfe8f95ccfc651f67a4fbe89d (diff) | |
| download | subsurface-95c2c06be440be62850ae06d201e55aa28415085.tar.gz | |
Clean up MacDive location conversion
We got additional slashes in front of the site if country and/or
location was missing.
Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
Signed-off-by: Dirk Hohndel <dirk@hohndel.org>
| -rw-r--r-- | xslt/MacDive.xslt | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/xslt/MacDive.xslt b/xslt/MacDive.xslt index 628c67eac..59b05c3fe 100644 --- a/xslt/MacDive.xslt +++ b/xslt/MacDive.xslt @@ -89,10 +89,10 @@ <location debug="true"> <xsl:for-each select="site/country|site/location|site/name"> <xsl:choose> - <xsl:when test="following-sibling::location[1] != ''"> + <xsl:when test="following-sibling::location[1] != '' and . != ''"> <xsl:value-of select="concat(., ' / ')"/> </xsl:when> - <xsl:when test="following-sibling::name[1] != ''"> + <xsl:when test="following-sibling::name[1] != '' and . != ''"> <xsl:value-of select="concat(., ' / ')"/> </xsl:when> <xsl:otherwise> @@ -114,10 +114,10 @@ <location> <xsl:for-each select="country|location|site"> <xsl:choose> - <xsl:when test="following-sibling::location[1] != ''"> + <xsl:when test="following-sibling::location[1] != '' and . != ''"> <xsl:value-of select="concat(., ' / ')"/> </xsl:when> - <xsl:when test="following-sibling::site[1] != ''"> + <xsl:when test="following-sibling::site[1] != '' and . != ''"> <xsl:value-of select="concat(., ' / ')"/> </xsl:when> <xsl:otherwise> |