Standards / ISO / Formatters / DCAT / Period of time using beginPosit…

…ion.
SPW-DIG · Apr 29, 2024 · 2d1e5d8 · 2d1e5d8
1 parent 1d42c08
commit 2d1e5d8
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-dataset.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-dataset.xsl
@@ -160,12 +160,12 @@
                 match="mri:extent/*/gex:temporalElement/*/gex:extent">
     <dct:temporal>
       <dct:PeriodOfTime>
-        <xsl:for-each select="*/gml:begin/*[gml:timePosition/text() != '']">
+        <xsl:for-each select="*/gml:begin/*[gml:timePosition/text() != '']|*/gml:beginPosition[. != '']">
           <xsl:call-template name="rdf-date">
             <xsl:with-param name="nodeName" select="'dcat:startDate'"/>
           </xsl:call-template>
         </xsl:for-each>
-        <xsl:for-each select="*/gml:end/*[gml:timePosition/text() != '']">
+        <xsl:for-each select="*/gml:end/*[gml:timePosition/text() != '']|*/gml:endPosition[. != '']">
           <xsl:call-template name="rdf-date">
             <xsl:with-param name="nodeName" select="'dcat:endDate'"/>
           </xsl:call-template>

diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-utils.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-utils.xsl
@@ -80,10 +80,14 @@
     <xsl:param name="nodeName"
                as="xs:string"/>
 
+    <xsl:variable name="date"
+                  as="xs:string?"
+                  select="if (*/text()) then */text() else text()"/>
+
     <xsl:element name="{$nodeName}">
       <xsl:attribute name="rdf:datatype"
-                     select="concat('http://www.w3.org/2001/XMLSchema#date', (if (contains(*/text(), 'T')) then 'Time' else ''))"/>
-      <xsl:value-of select="*/text()"/>
+                     select="concat('http://www.w3.org/2001/XMLSchema#date', (if (contains($date, 'T')) then 'Time' else ''))"/>
+      <xsl:value-of select="$date"/>
     </xsl:element>
   </xsl:template>