Skip to content

Commit e3c7c98

Browse files
authored
Lineage / handle process steps with multiple sources (#8874)
1 parent f728fc5 commit e3c7c98

File tree

3 files changed

+21
-25
lines changed
  • schemas
    • iso19115-3.2018/src/main/plugin/iso19115-3.2018/index-fields
    • iso19139/src/main/plugin/iso19139/index-fields
  • web-ui/src/main/resources/catalog/views/default/templates/recordView

3 files changed

+21
-25
lines changed

schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/index-fields/index.xsl

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1193,18 +1193,16 @@
11931193
<xsl:if test="$stepDateTimeZulu != ''">
11941194
,"date": "<xsl:value-of select="mrl:stepDateTime//gml:timePosition/text()"/>"
11951195
</xsl:if>
1196-
<xsl:if test="normalize-space(mrl:source) != ''">
1197-
,"source": [
1198-
<xsl:for-each select="mrl:source/*[mrl:description/gco:CharacterString != '']">
1199-
{
1200-
"descriptionObject": <xsl:value-of
1201-
select="gn-fn-index:add-multilingual-field(
1202-
'description', mrl:description, $allLanguages, true())"/>
1203-
}
1204-
<xsl:if test="position() != last()">,</xsl:if>
1205-
</xsl:for-each>
1206-
]
1207-
</xsl:if>
1196+
,"source": [
1197+
<xsl:for-each select="mrl:source/*[mrl:description/gco:CharacterString != '']">
1198+
{
1199+
"descriptionObject": <xsl:value-of
1200+
select="gn-fn-index:add-multilingual-field(
1201+
'description', mrl:description, $allLanguages, true())"/>
1202+
}
1203+
<xsl:if test="position() != last()">,</xsl:if>
1204+
</xsl:for-each>
1205+
]
12081206

12091207
<xsl:variable name="processor"
12101208
select="mrl:processor/*[.//cit:CI_Organisation/cit:name != '']"/>

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

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1075,18 +1075,16 @@
10751075
<xsl:if test="$stepDateTimeZulu != ''">
10761076
,"date": "<xsl:value-of select="gmd:dateTime/gco:*/text()"/>"
10771077
</xsl:if>
1078-
<xsl:if test="normalize-space(gmd:source) != ''">
1079-
,"source": [
1080-
<xsl:for-each select="gmd:source/*[gmd:description/gco:CharacterString != '']">
1081-
{
1082-
"descriptionObject": <xsl:value-of
1083-
select="gn-fn-index:add-multilingual-field(
1084-
'description', gmd:description, $allLanguages, true())"/>
1085-
}
1086-
<xsl:if test="position() != last()">,</xsl:if>
1087-
</xsl:for-each>
1088-
]
1089-
</xsl:if>
1078+
,"source": [
1079+
<xsl:for-each select="gmd:source/*[gmd:description/gco:CharacterString != '']">
1080+
{
1081+
"descriptionObject": <xsl:value-of
1082+
select="gn-fn-index:add-multilingual-field(
1083+
'description', gmd:description, $allLanguages, true())"/>
1084+
}
1085+
<xsl:if test="position() != last()">,</xsl:if>
1086+
</xsl:for-each>
1087+
]
10901088

10911089
<xsl:variable name="processors"
10921090
select="gmd:processor/*[gmd:organisationName/gco:CharacterString != '']"/>

web-ui/src/main/resources/catalog/views/default/templates/recordView/processsteps.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ <h2 data-translate="">processSteps</h2>
3030
<br data-ng-if="p.date || p.processor" />
3131
{{p.description}}
3232
</div>
33-
<div class="timeline-body" data-ng-if="p.source">
33+
<div class="timeline-body" data-ng-if="p.source.length">
3434
<span data-translate="">sourceDescription</span>
3535
<p data-ng-repeat="s in p.source">{{s.description}}</p>
3636
</div>

0 commit comments

Comments
 (0)