aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGravatar Miika Turkia <miika.turkia@gmail.com>2017-05-03 21:37:28 +0300
committerGravatar Dirk Hohndel <dirk@hohndel.org>2017-05-04 10:51:36 -0700
commit6897c38fece18a366f9d7ffa4143356373cdad5d (patch)
tree8cf9e69e16088f86056d8cf279967aa510ec9928
parentf14ad7f183f0422ad09c455212e1822bd7bdd3ee (diff)
downloadsubsurface-6897c38fece18a366f9d7ffa4143356373cdad5d.tar.gz
Include one more way to parse buddy on UDDF import
Fixes #377 Signed-off-by: Miika Turkia <miika.turkia@gmail.com>
-rw-r--r--xslt/uddf.xslt6
1 files changed, 3 insertions, 3 deletions
diff --git a/xslt/uddf.xslt b/xslt/uddf.xslt
index 89e40b1f1..567774cc0 100644
--- a/xslt/uddf.xslt
+++ b/xslt/uddf.xslt
@@ -209,12 +209,12 @@
</buddy>
</xsl:if>
- <xsl:if test="buddy_ref/@ref|informationbeforedive/buddy_ref/@ref != ''">
+ <xsl:if test="buddy_ref/@ref|informationbeforedive/buddy_ref/@ref|u:informationbeforedive/u:link/@ref != ''">
<buddy>
<xsl:variable name="ref">
- <xsl:value-of select="buddy_ref/@ref|informationbeforedive/buddy_ref/@ref"/>
+ <xsl:value-of select="buddy_ref/@ref|informationbeforedive/buddy_ref/@ref|u:informationbeforedive/u:link/@ref"/>
</xsl:variable>
- <xsl:for-each select="//diver[@id=$ref]/personal/first_name|//diver[@id=$ref]/personal/nick_name|//diver[@id=$ref]/personal/family_name|//diver/buddy[@id=$ref]/personal/first_name|//diver/buddy[@id=$ref]/personal/nick_name|//diver/buddy[@id=$ref]/personal/family_name">
+ <xsl:for-each select="//diver[@id=$ref]/personal/first_name|//diver[@id=$ref]/personal/nick_name|//diver[@id=$ref]/personal/family_name|//diver/buddy[@id=$ref]/personal/first_name|//diver/buddy[@id=$ref]/personal/nick_name|//diver/buddy[@id=$ref]/personal/family_name|//u:diver/u:buddy[@id=$ref]/u:personal/u:first_name|//u:diver/u:buddy[@id=$ref]/u:personal/u:nick_name|//u:diver/u:buddy[@id=$ref]/u:personal/u:family_name">
<xsl:value-of select="."/>
<xsl:if test=". != '' and (following-sibling::*[1] != '' or following-sibling::*[2] != '')"> / </xsl:if>
</xsl:for-each>