From b1aafd6c7b3adfedb6362ea7e18b5f5fc71f62e2 Mon Sep 17 00:00:00 2001
From: Francois Prunayre <fx.prunayre@gmail.com>
Date: Tue, 11 Aug 2020 13:12:36 +0200
Subject: [PATCH] Merge latest changes made in metadata101 which were not part
 of https://github.com/geonetwork/core-geonetwork/pull/4701.

---
 .../jsonld/iso19115-3.2018-to-jsonld.xsl      | 43 +++++++++++++------
 .../formatter/xsl-view/view.xsl               |  1 +
 .../iso19115-3.2018/loc/fre/codelists.xml     |  2 +-
 .../iso19115-3.2018/update-fixed-info.xsl     | 30 +++++++++++++
 4 files changed, 63 insertions(+), 13 deletions(-)

diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/jsonld/iso19115-3.2018-to-jsonld.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/jsonld/iso19115-3.2018-to-jsonld.xsl
index b035fc71475..d881b4d5314 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/jsonld/iso19115-3.2018-to-jsonld.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/jsonld/iso19115-3.2018-to-jsonld.xsl
@@ -87,10 +87,25 @@
       <entry key="nonGeographicDataset" value="Dataset"/>
       <entry key="dimensionGroup" value="TechArticle"/>
       <entry key="featureType" value="Dataset"/>
+      <entry key="attribute" value="CreativeWork"/>
+      <entry key="attributeType" value="Thing"/>
+      <entry key="feature" value="Thing"/>
+      <entry key="propertyType" value="Thing"/>
+      <entry key="fieldSession" value="Project"/>
+      <entry key="software" value="SoftwareApplication"/>
       <entry key="model" value="TechArticle"/>
       <entry key="tile" value="Dataset"/>
-      <entry key="fieldSession" value="Project"/>
+      <entry key="metadata" value="ArchiveComponent"/>
+      <entry key="initiative" value="Thing"/>
+      <entry key="sample" value="ArchiveComponent"/>
+      <entry key="document" value="DigitalDocument"/>
+      <entry key="repository" value="ArchiveComponent"/>
+      <entry key="aggregate" value="ArchiveComponent"/>
+      <entry key="product" value="Product"/>
+      <entry key="collection" value="ArchiveComponent"/>
+      <entry key="coverage" value="CreativeWork"/>
       <entry key="collectionSession" value="Project"/>
+
     </xsl:variable>
 
     <xsl:variable name="match"
@@ -153,15 +168,15 @@
     "@context": "http://schema.org/",
     <xsl:choose>
       <xsl:when test="mdb:metadataScope/*/mdb:resourceScope/*/@codeListValue != ''">
-        "@type": "<xsl:value-of select="schema-org-fn:getType(mdb:metadataScope/*/mdb:resourceScope/*/@codeListValue, 'schema:')"/>",
+        "@type": "<xsl:value-of select="schema-org-fn:getType(mdb:metadataScope/*/mdb:resourceScope/*/@codeListValue,'')"/>",
       </xsl:when>
       <xsl:otherwise>
-        "@type": "schema:Dataset",
+        "@type": "Dataset",
       </xsl:otherwise>
     </xsl:choose>
     <!-- TODO: Use the identifier property to attach any relevant Digital Object identifiers (DOIs). -->
     "@id": "<xsl:value-of select="concat($baseUrl, 'api/records/', mdb:metadataIdentifier[1]/*/mcc:code/*/text())"/>",
-    "includedInDataCatalog":[{"url":"<xsl:value-of select="concat($baseUrl, 'search#', $catalogueName)"/>","name":"<xsl:value-of select="$catalogueName"/>"}],
+    "includedInDataCatalog":[{"@type":"DataCatalog","url":"<xsl:value-of select="concat($baseUrl, 'search#', $catalogueName)"/>","name":"<xsl:value-of select="$catalogueName"/>"}],
     <!-- TODO: is the dataset language or the metadata language ? -->
     "inLanguage":"<xsl:value-of select="if ($requestedLanguage  != '') then $requestedLanguage else $defaultLanguage"/>",
     <!-- TODO: availableLanguage -->
@@ -242,10 +257,12 @@
           ,"name": <xsl:apply-templates mode="toJsonLDLocalized"
                                        select="."/>
         </xsl:for-each>
-        <xsl:for-each select=".//cit:electronicMailAddress">
-          ,"email": <xsl:apply-templates mode="toJsonLDLocalized"
-                                       select="."/>
-        </xsl:for-each>
+        <xsl:if test=".//cit:electronicMailAddress">
+            ,"email":  [<xsl:for-each select=".//cit:electronicMailAddress">
+            <xsl:apply-templates mode="toJsonLDLocalized" select="."/>
+            <xsl:if test="position() != last()">,</xsl:if>
+        </xsl:for-each>]
+        </xsl:if>
 
         <!-- TODO: only if children available -->
         ,"contactPoint": {
@@ -352,11 +369,13 @@
       -->
     </xsl:for-each>
 
-    <xsl:for-each select="mdb:identificationInfo/*/mri:resourceConstraints/mco:MD_LegalConstraints/mco:otherConstraints">
-      ,"license": <xsl:apply-templates mode="toJsonLDLocalized"
-                                      select="."/>
-    </xsl:for-each>
 
+    <xsl:if test="mdb:identificationInfo/*/mri:resourceConstraints/mco:MD_LegalConstraints/mco:otherConstraints">    
+      ,"license": [<xsl:for-each select="mdb:identificationInfo/*/mri:resourceConstraints/mco:MD_LegalConstraints/mco:otherConstraints"> 
+          <xsl:apply-templates mode="toJsonLDLocalized" select="."/>
+          <xsl:if test="position() != last()">,</xsl:if>
+      </xsl:for-each>]
+    </xsl:if>
     <!-- TODO: When a dataset derives from or aggregates several originals, use the isBasedOn property. -->
     <!-- TODO: hasPart -->
   }
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/xsl-view/view.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/xsl-view/view.xsl
index 7da0a6599af..2374028136c 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/xsl-view/view.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/xsl-view/view.xsl
@@ -386,6 +386,7 @@
                        *[gml:beginPosition != '']|*[gml:endPosition != '']|
                        *[gco:Date != '']|*[gco:DateTime != '']|*[gco:TM_PeriodDuration != '']|
                        *[*/@codeListValue]|*[@codeListValue]|
+                       gml:identifier[. != '']|gml:name[. != '']|
                        gml:description[. != '']|gml:timePosition[. != '']|
                        gml:beginPosition[. != '']|gml:endPosition[. != '']"
                 priority="500">
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/codelists.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/codelists.xml
index 5660d48e2fc..c1107780588 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/codelists.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/loc/fre/codelists.xml
@@ -1089,7 +1089,7 @@
     </entry>
     <entry>
       <code>dataCentre</code>
-      <label>Centre de données)</label>
+      <label>Centre de données</label>
       <description>Mot clé qui identifie un dépôt de données ou une archive qui
         gère et répartit des données
       </description>
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/update-fixed-info.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/update-fixed-info.xsl
index 5f086fcdea4..20b675f25f7 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/update-fixed-info.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/update-fixed-info.xsl
@@ -607,6 +607,36 @@
   </xsl:template>
 
 
+  <xsl:template match="mri:descriptiveKeywords[not(*/mri:thesaurusName)]" priority="10">
+    <xsl:variable name="name" select="name()"/>
+    <xsl:variable name="freeTextKeywordBlockType"
+                  select="*/mri:type/*/@codeListValue"/>
+    <xsl:variable name="isFirstFreeTextKeywordBlockOfThisType"
+                  select="count(preceding-sibling::*[
+                          name() = $name
+                          and not(*/mri:thesaurusName)
+                          and */mri:type/*/@codeListValue = $freeTextKeywordBlockType]) = 0"/>
+
+    <xsl:if test="$isFirstFreeTextKeywordBlockOfThisType">
+      <xsl:copy>
+        <xsl:apply-templates select="@*"/>
+        <mri:MD_Keywords>
+          <xsl:apply-templates select="*/mri:keyword"/>
+
+          <!-- Combine all free text keyword of same type -->
+          <xsl:apply-templates select="following-sibling::*[
+                      name() = $name
+                      and not(*/mri:thesaurusName)
+                      and */mri:type/*/@codeListValue = $freeTextKeywordBlockType]/*/mri:keyword"/>
+
+          <xsl:apply-templates select="*/mri:type"/>
+        </mri:MD_Keywords>
+      </xsl:copy>
+    </xsl:if>
+  </xsl:template>
+
+
+
   <!-- Remove empty DQ elements, empty transfer options. -->
   <xsl:template match="mdb:dataQualityInfo[count(*) = 0]"/>
   <xsl:template match="mrd:transferOptions[mrd:MD_DigitalTransferOptions/count(*) = 0]"/>