Indexing / keywords from the same thesaurus in different gmd:descript…

…iveKeywords elements are now grouped properly
geonetwork · Aug 14, 2018 · 860a092 · 860a092
1 parent 2941a6f
commit 860a092
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl b/schemas/iso19139/src/main/plugin/iso19139/index-fields/default.xsl
@@ -433,7 +433,7 @@
         <xsl:for-each-group select="//gmd:MD_Keywords[gmd:thesaurusName/*/gmd:title/*/text() != '']"
                             group-by="gmd:thesaurusName/*/gmd:title/*/text()">
           '<xsl:value-of select="replace(current-grouping-key(), '''', '\\''')"/>' :[
-          <xsl:for-each select="gmd:keyword/(gco:CharacterString|gmx:Anchor)">
+          <xsl:for-each select="current-group()/gmd:keyword/(gco:CharacterString|gmx:Anchor)">
             {'value': <xsl:value-of select="concat('''', replace(., '''', '\\'''), '''')"/>,
             'link': '<xsl:value-of select="@xlink:href"/>'}
             <xsl:if test="position() != last()">,</xsl:if>

diff --git a/schemas/iso19139/src/main/plugin/iso19139/index-fields/language-default.xsl b/schemas/iso19139/src/main/plugin/iso19139/index-fields/language-default.xsl
@@ -368,7 +368,7 @@
                               group-by="gmd:thesaurusName/*/gmd:title/*/text()">
 
             '<xsl:value-of select="replace(current-grouping-key(), '''', '\\''')"/>' :[
-            <xsl:for-each select="gmd:keyword//gmd:LocalisedCharacterString[@locale = $langId and text() != '']">
+            <xsl:for-each select="current-group()/gmd:keyword//gmd:LocalisedCharacterString[@locale = $langId and text() != '']">
               {'value': <xsl:value-of select="concat('''', replace(., '''', '\\'''), '''')"/>,
               'link': '<xsl:value-of select="@xlink:href"/>'}
               <xsl:if test="position() != last()">,</xsl:if>