Changeset 6897c38 in subsurface


Ignore:
Timestamp:
May 4, 2017, 10:51:36 AM (7 months ago)
Author:
Dirk Hohndel <dirk@…>
Branches:
master
Children:
fe92713
Parents:
f14ad7f
git-author:
Miika Turkia <miika.turkia@…> (05/03/17 11:37:28)
git-committer:
Dirk Hohndel <dirk@…> (05/04/17 10:51:36)
Message:

Include one more way to parse buddy on UDDF import

Fixes #377

Signed-off-by: Miika Turkia <miika.turkia@…>

File:
1 edited

Legend:

Unmodified
Added
Removed
  • xslt/uddf.xslt

    r63814254 r6897c38  
    210210      </xsl:if>
    211211
    212       <xsl:if test="buddy_ref/@ref|informationbeforedive/buddy_ref/@ref != ''">
     212      <xsl:if test="buddy_ref/@ref|informationbeforedive/buddy_ref/@ref|u:informationbeforedive/u:link/@ref != ''">
    213213        <buddy>
    214214          <xsl:variable name="ref">
    215             <xsl:value-of select="buddy_ref/@ref|informationbeforedive/buddy_ref/@ref"/>
     215            <xsl:value-of select="buddy_ref/@ref|informationbeforedive/buddy_ref/@ref|u:informationbeforedive/u:link/@ref"/>
    216216          </xsl:variable>
    217           <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">
     217          <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">
    218218            <xsl:value-of select="."/>
    219219            <xsl:if test=". != '' and (following-sibling::*[1] != '' or following-sibling::*[2] != '')"> / </xsl:if>
Note: See TracChangeset for help on using the changeset viewer.