diff --git a/src/main/resources/xsl/biocol2native.xsl b/src/main/resources/xsl/biocol2native.xsl index 030644261d7dd85946965be5f1284e186eff40de..5c83ce757d97cb2a609f4d5503fa563bed34b9b0 100644 --- a/src/main/resources/xsl/biocol2native.xsl +++ b/src/main/resources/xsl/biocol2native.xsl @@ -20,11 +20,15 @@ <xsl:when test="name() = 'def.biocol02'"> <xsl:apply-templates select="." mode="classification-native" /> </xsl:when> - <xsl:when test="name() = 'def.biocol04' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol04'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> - <xsl:when test="name() = 'def.biocol05' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol05'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> <xsl:when test="name() = 'def.biocol07'"> <xsl:apply-templates select="." mode="classification-native" /> @@ -35,20 +39,30 @@ <xsl:when test="name() = 'def.biocol16'"> <xsl:apply-templates select="." mode="classification-native" /> </xsl:when> - <xsl:when test="name() = 'def.biocol80' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol80'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> - <xsl:when test="name() = 'def.biocol81' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol81'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> - <xsl:when test="name() = 'def.biocol82' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol82'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> - <xsl:when test="name() = 'def.biocol83' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol83'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> - <xsl:when test="name() = 'def.biocol84' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol84'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> <xsl:when test="name() = 'def.biocol97'"> <xsl:apply-templates select="." mode="classification-native" /> diff --git a/src/main/resources/xsl/biocol2xml.xsl b/src/main/resources/xsl/biocol2xml.xsl index 4f34b7a5521718b3a71a50f3421980300f56caee..c7e09618d81f0f2aee2cdb665cc8d9cbe2760bd4 100644 --- a/src/main/resources/xsl/biocol2xml.xsl +++ b/src/main/resources/xsl/biocol2xml.xsl @@ -17,26 +17,40 @@ <xsl:choose> <xsl:when test="$access = 'true'"> <xsl:choose> - <xsl:when test="name() = 'def.biocol04' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol04'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> - <xsl:when test="name() = 'def.biocol05' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol05'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> - <xsl:when test="name() = 'def.biocol80' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol80'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> - <xsl:when test="name() = 'def.biocol81' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol81'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> - <xsl:when test="name() = 'def.biocol82' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol82'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> - <xsl:when test="name() = 'def.biocol83' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol83'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> - <xsl:when test="name() = 'def.biocol84' and $accessintern = 'true'"> - <xsl:copy-of select="." /> + <xsl:when test="name() = 'def.biocol84'"> + <xsl:if test="$accessintern = 'true'"> + <xsl:copy-of select="." /> + </xsl:if> </xsl:when> <xsl:otherwise> <xsl:copy-of select="." />