Skip to content

Commit 4b0e20d

Browse files
fxprunayreianwallen
fxprunayre
and
ianwallen
authored
Standard / ISO19139 / Fix removal of online source when multiple transfer options block are used. (#8281)
* Standard / ISO19139 / Fix removal of online source when multiple transfer options block are used. Follow up of #7431 * Fix online resource update/delete so that it supports multiple gmd:MD_DigitalTransferOptions blocks. --------- Co-authored-by: Ian Allen <ianwallen@hotmail.com>
1 parent aa52573 commit 4b0e20d

File tree

4 files changed

+39
-22
lines changed

4 files changed

+39
-22
lines changed

‎schemas/iso19139/src/main/plugin/iso19139/extract-relations.xsl‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
xmlns:xlink="http://www.w3.org/1999/xlink"
3636
xmlns:util="java:org.fao.geonet.util.XslUtil"
3737
xmlns:digestUtils="java:org.apache.commons.codec.digest.DigestUtils"
38-
xmlns:exslt="http://exslt.org/common"
3938
xmlns:gn-fn-rel="http://geonetwork-opensource.org/xsl/functions/relations"
4039
version="2.0"
4140
exclude-result-prefixes="#all">
@@ -110,7 +109,7 @@
110109
<xsl:value-of select="position()"/>
111110
</idx>
112111
<hash>
113-
<xsl:value-of select="digestUtils:md5Hex(string(exslt:node-set(normalize-space(.))))"/>
112+
<xsl:value-of select="digestUtils:md5Hex(normalize-space(.))"/>
114113
</hash>
115114
<url>
116115
<xsl:apply-templates mode="get-iso19139-localized-string"
@@ -142,7 +141,7 @@
142141
<xsl:value-of select="position()"/>
143142
</idx>
144143
<hash>
145-
<xsl:value-of select="digestUtils:md5Hex(string(exslt:node-set(normalize-space(.))))"/>
144+
<xsl:value-of select="digestUtils:md5Hex(normalize-space(.))"/>
146145
</hash>
147146
<title>
148147
<xsl:apply-templates mode="get-iso19139-localized-string"

‎schemas/iso19139/src/main/plugin/iso19139/index-fields/index.xsl‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
xmlns:gn-fn-index="http://geonetwork-opensource.org/xsl/functions/index"
3535
xmlns:index="java:org.fao.geonet.kernel.search.EsSearchManager"
3636
xmlns:digestUtils="java:org.apache.commons.codec.digest.DigestUtils"
37-
xmlns:exslt="http://exslt.org/common"
3837
xmlns:util="java:org.fao.geonet.util.XslUtil"
3938
xmlns:date-util="java:org.fao.geonet.utils.DateUtil"
4039
xmlns:daobs="http://daobs.org"
@@ -1122,8 +1121,7 @@
11221121
<xsl:copy-of select="gn-fn-index:add-multilingual-field('orderingInstructions', ., $allLanguages)"/>
11231122
</xsl:for-each>
11241123

1125-
<xsl:for-each select="gmd:transferOptions/*/
1126-
gmd:onLine/*[gmd:linkage/gmd:URL != '']">
1124+
<xsl:for-each select=".//gmd:onLine/*[gmd:linkage/gmd:URL != '']">
11271125

11281126
<xsl:variable name="transferGroup"
11291127
select="count(ancestor::gmd:transferOptions/preceding-sibling::gmd:transferOptions)"/>
@@ -1147,7 +1145,7 @@
11471145
<atomfeed><xsl:value-of select="gmd:linkage/gmd:URL"/></atomfeed>
11481146
</xsl:if>
11491147
<link type="object">{
1150-
"hash": "<xsl:value-of select="digestUtils:md5Hex(string(exslt:node-set(normalize-space(.))))"/>",
1148+
"hash": "<xsl:value-of select="digestUtils:md5Hex(normalize-space(.))"/>",
11511149
"idx": <xsl:value-of select="position()"/>,
11521150
"protocol":"<xsl:value-of select="util:escapeForJson((gmd:protocol/*/text())[1])"/>",
11531151
"mimeType":"<xsl:value-of select="if (*/gmx:MimeFileType)

‎schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-add.xsl‎

Lines changed: 19 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -187,19 +187,29 @@ Note: It assumes that it will be adding new items in
187187
<!-- Updating the gmd:onLine based on update parameters -->
188188
<!-- Note: first part of the match needs to match the xsl:for-each select from extract-relations.xsl in order to get the position() to match -->
189189
<!-- The unique identifier is marked with resourceIdx which is the position index and resourceHash which is hash code of the current node (combination of url, resource name, and description) -->
190-
<xsl:template
191-
match="*//gmd:MD_DigitalTransferOptions/gmd:onLine
192-
[gmd:CI_OnlineResource[gmd:linkage/gmd:URL!=''] and ($resourceIdx = '' or position() = xs:integer($resourceIdx))]
193-
[($resourceHash != '' or ($updateKey != '' and normalize-space($updateKey) = concat(
190+
<!-- Template to match all gmd:onLine elements -->
191+
<xsl:template match="//gmd:MD_DigitalTransferOptions/gmd:onLine" priority="2">
192+
<!-- Calculate the global position of the current gmd:onLine element -->
193+
<xsl:variable name="position" select="count(//gmd:MD_DigitalTransferOptions/gmd:onLine[current() >> .]) + 1" />
194+
195+
<xsl:choose>
196+
<xsl:when test="gmd:CI_OnlineResource[gmd:linkage/gmd:URL != ''] and
197+
($resourceIdx = '' or $position = xs:integer($resourceIdx)) and
198+
($resourceHash != '' or ($updateKey != '' and normalize-space($updateKey) = concat(
194199
gmd:CI_OnlineResource/gmd:linkage/gmd:URL,
195200
gmd:CI_OnlineResource/gmd:protocol/*,
196201
gmd:CI_OnlineResource/gmd:name/gco:CharacterString)))
197-
and ($resourceHash = '' or digestUtils:md5Hex(string(exslt:node-set(normalize-space(.)))) = $resourceHash)]"
198-
priority="2">
199-
<xsl:call-template name="createOnlineSrc"/>
202+
and ($resourceHash = '' or digestUtils:md5Hex(normalize-space(.)) = $resourceHash)">
203+
<xsl:call-template name="createOnlineSrc"/>
204+
</xsl:when>
205+
<xsl:otherwise>
206+
<xsl:copy>
207+
<xsl:apply-templates select="@*|node()"/>
208+
</xsl:copy>
209+
</xsl:otherwise>
210+
</xsl:choose>
200211
</xsl:template>
201212

202-
203213
<xsl:template name="createOnlineSrc">
204214
<!-- Add all online source from the target metadata to the
205215
current one -->
@@ -243,7 +253,7 @@ Note: It assumes that it will be adding new items in
243253
</gmd:URL>
244254
</gmd:linkage>
245255
<gmd:protocol>
246-
<xsl:call-template name="setProtocol"/>
256+
<xsl:call-template name="setProtocol"/>
247257
</gmd:protocol>
248258

249259
<xsl:if test="$applicationProfile != ''">

‎schemas/iso19139/src/main/plugin/iso19139/process/onlinesrc-remove.xsl‎

Lines changed: 16 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,15 +53,25 @@ Stylesheet used to remove a reference to a online resource.
5353
<!-- Remove the gmd:onLine define in url parameter -->
5454
<!-- Note: first part of the match needs to match the xsl:for-each select from extract-relations.xsl in order to get the position() to match -->
5555
<!-- The unique identifier is marked with resourceIdx which is the position index and resourceHash which is hash code of the current node (combination of url, resource name, and description) -->
56-
<xsl:template
57-
match="*//gmd:MD_DigitalTransferOptions/gmd:onLine
58-
[gmd:CI_OnlineResource[gmd:linkage/gmd:URL!=''] and ($resourceIdx = '' or (count(preceding::gmd:onLine) + 1) = xs:integer($resourceIdx))]
59-
[($resourceHash != '' or ($url != null and (normalize-space(gmd:CI_OnlineResource/gmd:linkage/gmd:URL) = $url and normalize-space(gmd:CI_OnlineResource/gmd:name/gco:CharacterString) = normalize-space($name)
56+
<xsl:template match="//gmd:MD_DigitalTransferOptions/gmd:onLine" priority="2">
57+
58+
<!-- Calculate the global position of the current gmd:onLine element -->
59+
<xsl:variable name="position" select="count(//gmd:MD_DigitalTransferOptions/gmd:onLine[current() >> .]) + 1" />
60+
61+
<xsl:if test="not(
62+
gmd:CI_OnlineResource[gmd:linkage/gmd:URL != ''] and
63+
($resourceIdx = '' or $position = xs:integer($resourceIdx)) and
64+
($resourceHash != '' or ($url != null and (normalize-space(gmd:CI_OnlineResource/gmd:linkage/gmd:URL) = $url and normalize-space(gmd:CI_OnlineResource/gmd:name/gco:CharacterString) = normalize-space($name)
6065
or normalize-space(gmd:CI_OnlineResource/gmd:linkage/gmd:URL) = $url and count(gmd:CI_OnlineResource/gmd:name/gmd:PT_FreeText/gmd:textGroup[gmd:LocalisedCharacterString = $name]) > 0
6166
or normalize-space(gmd:CI_OnlineResource/gmd:linkage/gmd:URL) = $url and normalize-space(gmd:CI_OnlineResource/gmd:protocol/*) = 'WWW:DOWNLOAD-1.0-http--download'))
6267
)
63-
and ($resourceHash = '' or digestUtils:md5Hex(string(exslt:node-set(normalize-space(.)))) = $resourceHash)]"
64-
priority="2"/>
68+
and ($resourceHash = '' or digestUtils:md5Hex(normalize-space(.)) = $resourceHash)
69+
)">
70+
<xsl:copy>
71+
<xsl:apply-templates select="@*|node()"/>
72+
</xsl:copy>
73+
</xsl:if>
74+
</xsl:template>
6575

6676
<!-- Do a copy of every node and attribute -->
6777
<xsl:template match="@*|node()">

0 commit comments

Comments
 (0)