From a33df1e747467c332769e43d8e76531e76c568e2 Mon Sep 17 00:00:00 2001
From: ByronCinNZ <cochranes4@eml.cc>
Date: Thu, 3 Oct 2024 10:50:07 +1300
Subject: [PATCH] Fix errors in MWLR dc export. Still need to add 'advanced'
 elements.

---
 .../formatter/mwlr_dc/view.xsl                | 32 +++++++------------
 .../iso19115-3.2018/layout/config-editor.xml  |  2 +-
 2 files changed, 13 insertions(+), 21 deletions(-)

diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/mwlr_dc/view.xsl b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/mwlr_dc/view.xsl
index 76828a45671..d8d6666b0ae 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/mwlr_dc/view.xsl
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/formatter/mwlr_dc/view.xsl
@@ -19,7 +19,7 @@
                 xmlns:dqm="http://standards.iso.org/iso/19157/-2/dqm/1.0"
                 xmlns:cit="http://standards.iso.org/iso/19115/-3/cit/2.0"
                 xmlns:mrl="http://standards.iso.org/iso/19115/-3/mrl/2.0"
-                xmlns:gml="http://www.opengis.net/gml"
+                xmlns:gml="http://www.opengis.net/gml/3.2"
                 exclude-result-prefixes="#all">
 
   <!-- ============================================================================================ -->
@@ -55,8 +55,8 @@
           </xsl:for-each>
         </xsl:for-each>
         <xsl:for-each select=".//mri:extent/gex:EX_Extent">
-          <xsl:for-each select="gex:temporalElement/gex:EX_TemporalExtent/gex:extent/gml:TimePeriod">
-            <dct:temporal><xsl:value-of select="gml:beginPosition"/> - <xsl:value-of select="gml:endPosition"/></dct:temporal>
+          <xsl:for-each select=".//gex:temporalElement/gex:EX_TemporalExtent/gex:extent">
+            <dct:temporal><xsl:value-of select=".//gml:beginPosition"/> - <xsl:value-of select=".//gml:endPosition"/></dct:temporal>
           </xsl:for-each>
           <!-- bounding box -->
           <xsl:for-each select=".//gex:geographicElement/gex:EX_GeographicBoundingBox">
@@ -88,42 +88,34 @@
         </xsl:for-each>
         <!-- subject -->
 
-        <xsl:for-each select=".//mri:descriptiveKeywords/mri:descriptiveKeywords/mri:MD_Keywords/mri:keyword/gco:CharacterString">
+        <xsl:for-each select=".//mri:descriptiveKeywords/mri:MD_Keywords/mri:keyword/(gco:CharacterString|gcx:Anchor)">
           <dc:subject><xsl:value-of select="."/></dc:subject>
         </xsl:for-each>
 
         <!-- language -->
-
-        <xsl:for-each select=".//mri:defaultLocale/lan:PT_Locale/lan:language/lan:languageCode">
-          <dc:language><xsl:value-of select="."/></dc:language>
-        </xsl:for-each>
+        <dc:language><xsl:value-of select=".//mri:defaultLocale/lan:PT_Locale/lan:language/lan:LanguageCode/@codeListValue"/></dc:language>
+        
 
         <!-- Type - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -->
 
-        <xsl:for-each select=".//mdb:metadataScope/mdb:MD_MetadataScope/mdb:resourceScope/mcc:MD_ScopeCode/@codeListValue">
+        <xsl:for-each select="../../mdb:metadataScope/mdb:MD_MetadataScope/mdb:resourceScope/mcc:MD_ScopeCode/@codeListValue">
           <dc:type><xsl:value-of select="."/></dc:type>
         </xsl:for-each>
 
         <!--Contact-->
 
-        <xsl:for-each select=".//mri:pointOfContact/cit:CI_Citation/cit:citedResponsibleParty/cit:CI_Responsibility[cit:role/cit:CI_RoleCode/@codeListValue='pointOfContact']/cit:party/cit:CI_Organisation/cit:name/gco:CharacterString">
+        <xsl:for-each select=".//mri:pointOfContact/cit:CI_Responsibility">
           <dc:creator>
-            <xsl:value-of select=".//cit:role/cit:CI_RoleCode/@codeListValue"/>
-            <xsl:value-of select=".//cit:party/cit:CI_Organisation/cit:name/gco:CharacterString"/>
-            <xsl:value-of select=".//cit:party/cit:CI_Organisation/cit:contactInfo/cit:CI_Contact/cit:address/cit:CI_Address>/cit:electronicMailAddress/gco:CharacterString"/>
+            <xsl:value-of select=".//cit:role/cit:CI_RoleCode/@codeListValue"
+            /> - <xsl:value-of select=".//cit:party/cit:CI_Organisation/cit:name/gco:CharacterString"
+            /> - <xsl:value-of select=".//cit:party/cit:CI_Organisation/cit:contactInfo/cit:CI_Contact/cit:address/cit:CI_Address/cit:electronicMailAddress/gco:CharacterString"/>
           </dc:creator>
         </xsl:for-each>
 
         <!-- rights -->
 
         <xsl:for-each select=".//mri:resourceConstraints/mco:MD_LegalConstraints">
-          <xsl:for-each select=".//mco:MD_RestrictionCode/@codeListValue">
-            <dc:rights><xsl:value-of select="."/></dc:rights>
-          </xsl:for-each>
-
-          <xsl:for-each select=".//mco:otherConstraints/gco:CharacterString">
-            <dc:rights><xsl:value-of select="."/></dc:rights>
-          </xsl:for-each>
+            <dc:rights><xsl:value-of select=".//mco:MD_RestrictionCode/@codeListValue"/> - <xsl:value-of select="./*/gco:CharacterString"/></dc:rights>
         </xsl:for-each>
 
 
diff --git a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
index c9f87cdc669..d287a9c2e06 100644
--- a/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
+++ b/schemas/iso19115-3.2018/src/main/plugin/iso19115-3.2018/layout/config-editor.xml
@@ -900,7 +900,7 @@
           </field>
         </section>
         <!--Language-->
-        <section name="Langauage">
+        <section name="Language">
           <field xpath="/mdb:MD_Metadata/mdb:identificationInfo/*/mri:defaultLocale/lan:PT_Locale/lan:language"
                  or="language" in="/mdb:MD_Metadata/mdb:identificationInfo/*/mri:defaultLocale/lan:PT_Locale" />
         </section>