From e75ee33f308cb08ad291263c9cff3f71ed4c9457 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jose=20Garc=C3=ADa?= <josegar74@gmail.com>
Date: Thu, 23 Nov 2023 12:09:33 +0100
Subject: [PATCH] Fix indexing of iso19110 metadata with cardinalities composed
 of multiple ranges (#7486)
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* Fix indexing of iso19110 metadata with cardinalities with multiple ranges

* Update schemas/iso19110/src/main/plugin/iso19110/index-fields/index.xsl

Co-authored-by: François Prunayre <fx.prunayre@gmail.com>

---------

Co-authored-by: François Prunayre <fx.prunayre@gmail.com>
---
 .../src/main/plugin/iso19110/index-fields/index.xsl        | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/schemas/iso19110/src/main/plugin/iso19110/index-fields/index.xsl b/schemas/iso19110/src/main/plugin/iso19110/index-fields/index.xsl
index 8eef33934d7..1706f2d20bc 100644
--- a/schemas/iso19110/src/main/plugin/iso19110/index-fields/index.xsl
+++ b/schemas/iso19110/src/main/plugin/iso19110/index-fields/index.xsl
@@ -118,7 +118,12 @@
               "link": "<xsl:value-of select="*/gfc:code/*/@xlink:href"/>",
               "type": "<xsl:value-of select="*/gfc:valueType/gco:TypeName/gco:aName/*/text()"/>"
               <xsl:if test="*/gfc:cardinality">
-                ,"cardinality": "<xsl:value-of select="concat(*/gfc:cardinality//gco:lower/*/text(), '..', */gfc:cardinality//gco:upper/*/text())"/>"
+                <xsl:variable name="cardinalityValue">
+                  <xsl:for-each select="*/gfc:cardinality/*/gco:range">
+                    <xsl:value-of select="concat(*/gco:lower/*/text(), '..', */gco:upper/*/text())"/><xsl:if test="position() != last()">, </xsl:if>
+                  </xsl:for-each>
+                </xsl:variable>
+                ,"cardinality": "<xsl:value-of select="$cardinalityValue"/>"
               </xsl:if>
               <xsl:variable name="codeList"
                             select="*/gfc:listedValue[normalize-space(*) != '']"/>