Merge remote-tracking branch 'mw/dcat' into metawal-4.4.x

SPW-DIG · Apr 30, 2024 · db3a31b · db3a31b
2 parents 077b07e + 5f34876
commit db3a31b
Show file tree

Hide file tree

Showing 7 changed files with 37 additions and 28 deletions.
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/common.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/common.xsl
@@ -12,7 +12,6 @@
                 extension-element-prefixes="saxon"
                 exclude-result-prefixes="#all">
 
-
   <xsl:param name="format"
              select="'html'"/>
 

diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/view.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/citation/view.xsl
@@ -13,15 +13,15 @@
                 extension-element-prefixes="saxon"
                 exclude-result-prefixes="#all">
 
+  <xsl:import href="base.xsl"/>
+  <xsl:import href="common.xsl"/>
+
   <xsl:output omit-xml-declaration="yes"
               method="xml"
               indent="yes"
               saxon:indent-spaces="2"
               encoding="UTF-8"/>
 
-  <xsl:import href="base.xsl"/>
-  <xsl:import href="common.xsl"/>
-
   <xsl:variable name="metadata"
                 select="/root/mdb:MD_Metadata"/>
 

diff --git a/...o19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl b/...o19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/dcat/dcat-core-access-and-use.xsl
@@ -78,15 +78,16 @@
     <xsl:if test="count(../preceding-sibling::mri:resourceConstraints/*[mco:useConstraints]) = 0">
       <xsl:variable name="useConstraints"
                     as="node()*">
-        <xsl:copy-of select="../../mri:resourceConstraints/*[mco:useConstraints]/mco:otherConstraints"/>
-        <xsl:copy-of select="../../mri:resourceConstraints/*[mco:useConstraints]/mco:useLimitation"/>
+        <xsl:copy-of select="ancestor::mri:resourceConstraints/*[mco:useConstraints]/mco:otherConstraints"/>
+        <xsl:copy-of select="ancestor::mri:resourceConstraints/*[mco:useConstraints]/mco:useLimitation"/>
       </xsl:variable>
       <xsl:for-each select="$useConstraints">
         <xsl:choose>
           <xsl:when test="position() = 1">
             <dct:license>
               <dct:LicenseDocument>
                 <xsl:choose>
+                  <!-- TODO: isMappingResourceConstraintsToEuVocabulary -->
                   <xsl:when test="gcx:Anchor/@xlink:href">
                     <xsl:attribute name="rdf:about" select="gcx:Anchor/@xlink:href"/>
                   </xsl:when>

diff --git a/.../iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl b/.../iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/eu-dcat-ap/eu-dcat-ap-core.xsl
@@ -17,10 +17,27 @@
   <xsl:import href="../dcat/dcat-core.xsl"/>
   <xsl:import href="eu-dcat-ap-core-dataset.xsl"/>
 
+  <!--
+   If true, all resource constraints are preserved in the output.
+   The first one is a license, others are dct:rights.
+   See iso19115-3-to-dcat-license in dcat-core-access-and-use.xsl
+   -->
   <xsl:variable name="isPreservingAllResourceConstraints"
                 as="xs:boolean"
                 select="false()"/>
 
+  <!--
+  If true, the mapping of resource constraints to the EU DCAT-AP vocabulary is enabled.
+  eg. http://creativecommons.org/licenses/by/4.0/ is replaced by http://publications.europa.eu/resource/authority/licence/CC_BY_4.0
+  -->
+  <xsl:variable name="isMappingResourceConstraintsToEuVocabulary"
+                as="xs:boolean"
+                select="true()"/>
+
+  <!--
+  If true, the ISO resource scope is preserved in the output.
+  See iso19115-3-to-dcat-metadataScope in dcat-core.xsl
+  -->
   <xsl:variable name="isPreservingIsoType"
                 as="xs:boolean"
                 select="false()"/>
@@ -116,18 +133,6 @@
    * keep only first.
    * Use dct:license for the first useLimitation and then dct:rights?
   -->
-  <xsl:template mode="iso19115-3-to-dcat"
-                match="mdb:identificationInfo/*/mri:resourceConstraints/*[mco:useConstraints]/mco:otherConstraints
-                      |mdb:identificationInfo/*/mri:resourceConstraints/*[mco:useConstraints]/mco:useLimitation"
-                priority="2">
-    <xsl:variable name="allLicenseStatements"
-                  select="ancestor::mri:resourceConstraints/*[mco:useConstraints]/(mco:otherConstraints|mco:useLimitation)"/>
-
-    <!-- Keep first constraints statement / Ignore others -->
-    <xsl:if test="current()/generate-id() = $allLicenseStatements[1]/generate-id()">
-      <xsl:call-template name="iso19115-3-to-dcat-license"/>
-    </xsl:if>
-  </xsl:template>
 
 
   <!-- [o]	provenance	Provenance Statement	0..*	A statement about the lineage of a Dataset.

diff --git a/schemas/iso19139/src/main/plugin/iso19139/formatter/citation/view.xsl b/schemas/iso19139/src/main/plugin/iso19139/formatter/citation/view.xsl
@@ -18,15 +18,15 @@
                 extension-element-prefixes="saxon"
                 exclude-result-prefixes="#all">
 
+  <xsl:include href="base.xsl"/>
+  <xsl:include href="../../../iso19115-3.2018/formatter/citation/common.xsl"/>
+
   <xsl:output omit-xml-declaration="yes"
               method="xml"
               indent="yes"
               saxon:indent-spaces="2"
               encoding="UTF-8"/>
 
-  <xsl:include href="base.xsl"/>
-  <xsl:include href="../../../iso19115-3.2018/formatter/citation/common.xsl"/>
-
   <xsl:variable name="metadata"
                 select="/root/gmd:MD_Metadata"/>
 

diff --git a/web-ui/src/main/resources/catalog/components/viewer/wps/WpsDirective.js b/web-ui/src/main/resources/catalog/components/viewer/wps/WpsDirective.js
@@ -253,19 +253,23 @@
                   return "time";
                 } else if (scope.isDate(input)) {
                   return "date";
-                } if (scope.isDateTime(input)) {
+                }
+                if (scope.isDateTime(input)) {
                   return "datetime-local";
-                } else
-                return "";
+                } else return "";
               };
               scope.getDateBounds = function (input, isMin) {
                 if (!input) {
                   return;
                 } else if (isMin) {
-                  return input.literalData.allowedValues.valueOrRange[0].minimumValue
-                    .value || "";
+                  return (
+                    input.literalData.allowedValues.valueOrRange[0].minimumValue.value ||
+                    ""
+                  );
                 }
-                return input.literalData.allowedValues.valueOrRange[0].maximumValue.value || "";
+                return (
+                  input.literalData.allowedValues.valueOrRange[0].maximumValue.value || ""
+                );
               };
 
               // get values from wfs filters

diff --git a/web/src/main/webapp/WEB-INF/classes/org/fao/geonet/api/Messages_fre.properties b/web/src/main/webapp/WEB-INF/classes/org/fao/geonet/api/Messages_fre.properties
@@ -112,7 +112,7 @@ metadata_published_text=Les fiches suivantes ont \u00E9t\u00E9 trait\u00E9es:\n\
     <ul>%s</ul>
 metadata_published_record_text=<li>La m\u00E9tadonn\u00E9e <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 publi\u00E9e.</li>
 metadata_unpublished_record_text=<li>La m\u00E9tadonn\u00E9e <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 d\u00E9publi\u00E9e.</li>
-metadata_approved_published_record_text=<li>La m\u00E9tadonn\u00E9e <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 publi\u00E9e dans une nouvelle version.</li>
+metadata_approved_published_record_text=<li>Une nouvelle version de la m\u00E9tadonn\u00E9e <a href="{{link}}">{{index:resourceTitleObject}}</a> a \u00E9t\u00E9 publi\u00E9e.</li>
 
 api.groups.group_not_found=Le groupe avec l''identifiant ''{0}'' n''a pas \u00E9t\u00E9 trouv\u00E9 dans le catalogue.
 user_watchlist_subject=%s / %d mises \u00e0 jour dans vos fiches surveill\u00E9es %s