From 04f3507e8cfff299960a98f4b4337d8e87a64586 Mon Sep 17 00:00:00 2001
From: Twan Goosen <twan@clarin.eu>
Date: Mon, 6 Jan 2025 16:10:37 +0200
Subject: [PATCH] set provider name as collection display name if parameter is
 set. Refs #16

---
 datacite-cmdi/datacite-cmdi.xpr               | 83 +++++++++++++++----
 datacite-cmdi/datacite_to_cmdi-common.xsl     |  9 ++
 datacite-cmdi/datacite_to_cmdi-kernel3.xsl    |  6 +-
 datacite-cmdi/datacite_to_cmdi-kernel4.xsl    |  6 +-
 datacite-cmdi/datacite_to_cmdi.xsl            |  3 +
 .../output/doi_10_5072_FK2_VA3BVU.cmdi        |  3 +-
 6 files changed, 88 insertions(+), 22 deletions(-)

diff --git a/datacite-cmdi/datacite-cmdi.xpr b/datacite-cmdi/datacite-cmdi.xpr
index 79fae23..8da56e2 100644
--- a/datacite-cmdi/datacite-cmdi.xpr
+++ b/datacite-cmdi/datacite-cmdi.xpr
@@ -1,25 +1,25 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project>
+<project version="22.1">
     <meta>
         <filters directoryPatterns="" filePatterns="datacite-cmdi.xpr" positiveFilePatterns="" showHiddenFiles="false"/>
         <options>
-            <serialized xml:space="preserve">
+            <serialized version="22.1" xml:space="preserve">
                 <serializableOrderedMap>
                     <entry>
                         <String>scenario.associations</String>
                         <scenarioAssociation-array>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>datacite_to_cmdi.xsl</String>
+                                    <String>test/example/trolling/doi_10_5072_FK2_VA3BVU.xml</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
-                                        <String>datacite_to_cmdi_hamburg</String>
+                                        <String>DataCite to CMDI</String>
                                     </list>
                                 </field>
                                 <field name="scenarioTypes">
                                     <list>
-                                        <String>XML</String>
+                                        <String>XSL</String>
                                     </list>
                                 </field>
                                 <field name="scenarioStorageLocations">
@@ -30,16 +30,16 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>../../test-oai-harvest/output-test/filtertest/workdir/test-test/oai-pmh/DataCite/DataCite_0000001.xml</String>
+                                    <String>datacite_to_cmdi.xsl</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
-                                        <String>OAI-PMH filter</String>
+                                        <String>datacite_to_cmdi_hamburg</String>
                                     </list>
                                 </field>
                                 <field name="scenarioTypes">
                                     <list>
-                                        <String>XSL</String>
+                                        <String>XML</String>
                                     </list>
                                 </field>
                                 <field name="scenarioStorageLocations">
@@ -50,11 +50,11 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>../../../../../Downloads/oai_doreco_huma_num_fr_anal1239.xml</String>
+                                    <String>../../test-oai-harvest/output-test/filtertest/workdir/test-test/oai-pmh/DataCite/DataCite_0000001.xml</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
-                                        <String>olac2cmdi</String>
+                                        <String>OAI-PMH filter</String>
                                     </list>
                                 </field>
                                 <field name="scenarioTypes">
@@ -70,7 +70,7 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>../../../../../Desktop/Untitled1.xml</String>
+                                    <String>../../../../../Downloads/oai_doreco_huma_num_fr_anal1239.xml</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
@@ -90,11 +90,11 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>test/example/dariah/10.20375_0000-000E-8BE7-1.xml</String>
+                                    <String>../../../../../Desktop/Untitled1.xml</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
-                                        <String>DataCite to CMDI</String>
+                                        <String>olac2cmdi</String>
                                     </list>
                                 </field>
                                 <field name="scenarioTypes">
@@ -110,7 +110,7 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>test/example/afp/adp_ads974_v1.xml</String>
+                                    <String>test/example/dariah/10.20375_0000-000E-8BE7-1.xml</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
@@ -130,7 +130,7 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>test/example/celr/ty_0005.xml</String>
+                                    <String>test/example/afp/adp_ads974_v1.xml</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
@@ -150,7 +150,7 @@
                             </scenarioAssociation>
                             <scenarioAssociation>
                                 <field name="url">
-                                    <String>test/example/trolling/doi_10_5072_FK2_VA3BVU.xml</String>
+                                    <String>test/example/celr/ty_0005.xml</String>
                                 </field>
                                 <field name="scenarioIds">
                                     <list>
@@ -3304,7 +3304,56 @@
                                     <Boolean>true</Boolean>
                                 </field>
                                 <field name="xsltParams">
-                                    <list/>
+                                    <list>
+                                        <transformationParameter>
+                                            <field name="paramDescription">
+                                                <paramDescriptor>
+                                                    <field name="localName">
+                                                        <String>collection_name</String>
+                                                    </field>
+                                                    <field name="prefix">
+                                                        <null/>
+                                                    </field>
+                                                    <field name="namespace">
+                                                        <null/>
+                                                    </field>
+                                                </paramDescriptor>
+                                            </field>
+                                            <field name="value">
+                                                <String>test collection name</String>
+                                            </field>
+                                            <field name="hasXPathValue">
+                                                <Boolean>false</Boolean>
+                                            </field>
+                                            <field name="isStatic">
+                                                <Boolean>false</Boolean>
+                                            </field>
+                                        </transformationParameter>
+                                        <transformationParameter>
+                                            <field name="paramDescription">
+                                                <paramDescriptor>
+                                                    <field name="localName">
+                                                        <String>provider_name</String>
+                                                    </field>
+                                                    <field name="prefix">
+                                                        <null/>
+                                                    </field>
+                                                    <field name="namespace">
+                                                        <null/>
+                                                    </field>
+                                                </paramDescriptor>
+                                            </field>
+                                            <field name="value">
+                                                <String>test provider name</String>
+                                            </field>
+                                            <field name="hasXPathValue">
+                                                <Boolean>false</Boolean>
+                                            </field>
+                                            <field name="isStatic">
+                                                <Boolean>false</Boolean>
+                                            </field>
+                                        </transformationParameter>
+                                    </list>
                                 </field>
                                 <field name="cascadingStylesheets">
                                     <String-array/>
diff --git a/datacite-cmdi/datacite_to_cmdi-common.xsl b/datacite-cmdi/datacite_to_cmdi-common.xsl
index 246b1e2..becb20c 100644
--- a/datacite-cmdi/datacite_to_cmdi-common.xsl
+++ b/datacite-cmdi/datacite_to_cmdi-common.xsl
@@ -105,6 +105,15 @@
             </xsl:element>
         </xsl:if>
     </xsl:template>
+    
+    <xsl:template name="collectionDisplayName">
+        <xsl:param name="collection_name" select="''"/>
+        <xsl:if test="normalize-space($collection_name)!=''">
+            <MdCollectionDisplayName>
+                <xsl:value-of select="$collection_name"/>
+            </MdCollectionDisplayName>
+        </xsl:if>
+    </xsl:template>
 
     <xsl:function name="datacite_cmd:isAbsoluteUri">
         <xsl:param name="value"/>
diff --git a/datacite-cmdi/datacite_to_cmdi-kernel3.xsl b/datacite-cmdi/datacite_to_cmdi-kernel3.xsl
index 5efce05..c2d85af 100644
--- a/datacite-cmdi/datacite_to_cmdi-kernel3.xsl
+++ b/datacite-cmdi/datacite_to_cmdi-kernel3.xsl
@@ -33,7 +33,7 @@
     <xsl:template match="resource" mode="root">
         <cmd:CMD CMDVersion="1.2"
             xsi:schemaLocation="http://www.clarin.eu/cmd/1 https://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/1.x/profiles/clarin.eu:cr1:p_1610707853541/xsd">
-            <xsl:apply-templates select="." mode="header-section"/>
+            <xsl:apply-templates select="." mode="header-section" />
             <xsl:apply-templates select="." mode="resource-section"/>
             <cmd:Components>
                 <DataCiteRecord>
@@ -109,7 +109,9 @@
             <!-- Can we generate a selflink? -->
             <!--                <cmd:MdSelfLink>http://www.oxygenxml.com/</cmd:MdSelfLink>-->
             <cmd:MdProfile><xsl:value-of select="$cmdiProfileId"/></cmd:MdProfile>
-            <!--<cmd:MdCollectionDisplayName>MdCollectionDisplayName0</cmd:MdCollectionDisplayName>-->
+            <xsl:call-template name="collectionDisplayName">
+                <xsl:with-param name="collection_name" select="$collection_name" />
+            </xsl:call-template>
         </cmd:Header>
     </xsl:template>
 
diff --git a/datacite-cmdi/datacite_to_cmdi-kernel4.xsl b/datacite-cmdi/datacite_to_cmdi-kernel4.xsl
index bfd00d7..69a4b52 100644
--- a/datacite-cmdi/datacite_to_cmdi-kernel4.xsl
+++ b/datacite-cmdi/datacite_to_cmdi-kernel4.xsl
@@ -33,7 +33,7 @@
     <xsl:template match="resource" mode="root">
         <cmd:CMD CMDVersion="1.2"
             xsi:schemaLocation="http://www.clarin.eu/cmd/1 https://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/1.x/profiles/clarin.eu:cr1:p_1610707853541/xsd">
-            <xsl:apply-templates select="." mode="header-section"/>
+            <xsl:apply-templates select="." mode="header-section" />
             <xsl:apply-templates select="." mode="resource-section"/>
             <cmd:Components>
                 <DataCiteRecord>
@@ -109,7 +109,9 @@
             <!-- Can we generate a selflink? -->
             <!--                <cmd:MdSelfLink>http://www.oxygenxml.com/</cmd:MdSelfLink>-->
             <cmd:MdProfile><xsl:value-of select="$cmdiProfileId"/></cmd:MdProfile>
-            <!--<cmd:MdCollectionDisplayName>MdCollectionDisplayName0</cmd:MdCollectionDisplayName>-->
+            <xsl:call-template name="collectionDisplayName">
+                <xsl:with-param name="collection_name" select="$collection_name" />
+            </xsl:call-template>
         </cmd:Header>
     </xsl:template>
 
diff --git a/datacite-cmdi/datacite_to_cmdi.xsl b/datacite-cmdi/datacite_to_cmdi.xsl
index b694e33..9c647bc 100644
--- a/datacite-cmdi/datacite_to_cmdi.xsl
+++ b/datacite-cmdi/datacite_to_cmdi.xsl
@@ -35,6 +35,9 @@
 
     <xsl:output indent="yes"/>
     
+    <xsl:param name="provider_name" select="''"/>
+    <xsl:param name="collection_name" select="$provider_name"/>
+    
     <xsl:include href="datacite_to_cmdi-common.xsl"/>
     <xsl:include href="datacite_to_cmdi-kernel3.xsl"/>
     <xsl:include href="datacite_to_cmdi-kernel4.xsl"/>
diff --git a/datacite-cmdi/test/example/trolling/output/doi_10_5072_FK2_VA3BVU.cmdi b/datacite-cmdi/test/example/trolling/output/doi_10_5072_FK2_VA3BVU.cmdi
index 8f54cbe..06d7dba 100644
--- a/datacite-cmdi/test/example/trolling/output/doi_10_5072_FK2_VA3BVU.cmdi
+++ b/datacite-cmdi/test/example/trolling/output/doi_10_5072_FK2_VA3BVU.cmdi
@@ -7,6 +7,7 @@
          xsi:schemaLocation="http://www.clarin.eu/cmd/1 https://catalog.clarin.eu/ds/ComponentRegistry/rest/registry/1.x/profiles/clarin.eu:cr1:p_1610707853541/xsd">
    <cmd:Header>
       <cmd:MdProfile>clarin.eu:cr1:p_1610707853541</cmd:MdProfile>
+      <MdCollectionDisplayName>test collection name</MdCollectionDisplayName>
    </cmd:Header>
    <cmd:Resources>
       <cmd:ResourceProxyList>
@@ -214,7 +215,7 @@
                   <note>Conversion from DataCite (http://datacite.org/schema/kernel-4) to CMD (profile clarin.eu:cr1:p_1610707853541)</note>
                   <ActivityInfo>
                      <When>
-                        <date>2022-04-11+03:00</date>
+                        <date>2025-01-06+02:00</date>
                      </When>
                   </ActivityInfo>
                </Activity>