From c378e422828b019277b846ad0f40c926db935915 Mon Sep 17 00:00:00 2001
From: ByronCinNZ <cochranes4@eml.cc>
Date: Thu, 3 Oct 2024 13:40:48 +1300
Subject: [PATCH] Improved capture of Distributor format in MWLR Core editor

---
 .../formatter/mwlr_dc/view.xsl                |  6 ++--
 .../iso19115-3.2018/layout/config-editor.xml  | 28 ++++++++++++++++++-
 2 files changed, 30 insertions(+), 4 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 8701fa1b9a1..82128479c4a 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
@@ -156,9 +156,9 @@
       </xsl:for-each>
 
       <!--Format-->
-      <xsl:for-each select=".//mdb:distributionInfo/mrd:MD_Distribution">
-        <dc:format><xsl:value-of select=".//mrd:distributionFormat/
-              mrd:MD_Format/mrd:formatSpecificationCitation/cit:CI_Citation/cit:title" /></dc:format>
+      <xsl:for-each select=".//mdb:distributionInfo/mrd:MD_Distribution/mrd:distributionFormat/
+              mrd:MD_Format/mrd:formatSpecificationCitation/cit:CI_Citation/cit:title/gco:CharacterString">
+        <dc:format><xsl:value-of select="." /></dc:format>
       </xsl:for-each>
 
       <!--AccessRights-->
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 d287a9c2e06..dc9c89f2dc7 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
@@ -1032,8 +1032,32 @@
             </action>
           </section>
           <!--Format-->
-          <section name="Format of the dataset" xpath="/mdb:MD_Metadata/mdb:distributionInfo/mrd:MD_Distribution/mrd:distributionFormat/
+          <section name="Format of the dataset">
+            <field xpath="/mdb:MD_Metadata/mdb:distributionInfo/mrd:MD_Distribution/mrd:distributionFormat/
               mrd:MD_Format/mrd:formatSpecificationCitation/cit:CI_Citation/cit:title"/>
+            <action type="add"
+                    btnLabel="Add Distribution Format"
+                    or="distributionFormat"
+                    in="/mdb:MD_Metadata/mdb:distributionInfo/mrd:MD_Distribution">
+              <template>
+                <snippet>
+
+                      <mrd:distributionFormat>
+                        <mrd:MD_Format>
+                          <mrd:formatSpecificationCitation>
+                            <cit:CI_Citation>
+                              <cit:title>
+                                <gco:CharacterString></gco:CharacterString>
+                              </cit:title>
+                            </cit:CI_Citation>
+                          </mrd:formatSpecificationCitation>
+                        </mrd:MD_Format>
+                      </mrd:distributionFormat>
+
+                </snippet>
+              </template>
+            </action>-->
+          </section>
           <!--Access rights-->
           <!--Derived from-->
           <section name="Derived from">
@@ -1098,6 +1122,7 @@
       <flatModeExceptions>
         <for name="mrl:LI_Source"/>
         <for name="mrl:description"/>
+        <for name="mrd:distributionFormat"/>
         <for name="mri:purpose"/>
         <for name="mri:supplementalInformation"/>
         <for name="cit:alternateTitle"/>
@@ -1112,6 +1137,7 @@
         <for name="gfc:carrierOfCharacteristics"/>
         <for name="cit:party"/>
         <for name="cit:name"/>
+        <for name="cit:title"/>
         <for name="cit:CI_Individual"/>
         <for name="cit:CI_Organisation"/>
         <for name="gfc:listedValue"/>