From cb6bc5029301ec2efa392cf9df50f685eb12d5e0 Mon Sep 17 00:00:00 2001
From: Jose Blanco <blancoj@umich.edu>
Date: Thu, 22 Aug 2024 15:16:31 -0400
Subject: [PATCH] request copy change and DataCite Schema 4 change

---
 .../requestitem/RequestItemEmailNotifier.java |  32 +++-
 .../xmlworkflow/XmlWorkflowServiceImpl.java   |  10 ++
 dspace/config/crosswalks/DIM2DataCite.xsl     | 141 +++++++++++-------
 dspace/config/emails/request_item.granted     |   2 +-
 dspace/config/emails/request_item.grantor     |  11 ++
 dspace/config/emails/request_item.rejected    |   2 +-
 dspace/config/item-submission.xml             |   4 +-
 dspace/config/modules/oai.cfg                 |  11 +-
 dspace/config/submission-forms.xml            |  36 +++--
 9 files changed, 178 insertions(+), 71 deletions(-)
 create mode 100644 dspace/config/emails/request_item.grantor

diff --git a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java
index bdb0c30c3d68..7718db5e066a 100644
--- a/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java
+++ b/dspace-api/src/main/java/org/dspace/app/requestitem/RequestItemEmailNotifier.java
@@ -32,7 +32,8 @@
 import org.dspace.handle.service.HandleService;
 import org.dspace.services.ConfigurationService;
 
-
+// import org.dspace.content.service.ItemService;
+// import org.dspace.content.MetadataSchemaEnum;
 
 /**
  * Send item requests and responses by email.
@@ -62,6 +63,11 @@ public class RequestItemEmailNotifier {
 
     protected final RequestItemAuthorExtractor requestItemAuthorExtractor;
 
+
+    // @Inject
+    // protected ItemService itemService;
+
+
     @Inject
     public RequestItemEmailNotifier(RequestItemAuthorExtractor requestItemAuthorExtractor) {
         this.requestItemAuthorExtractor = requestItemAuthorExtractor;
@@ -165,8 +171,14 @@ public void sendResponse(Context context, RequestItem ri, String subject,
             grantors = List.of();
         }
 
+        //Need Grantor name and email, this would be the following metadata requestitem.email and requestitem.name
+
         String grantorName;
         String grantorAddress;
+
+        //grantorAddress = itemService.getMetadataFirstValue(ri.getItem(), MetadataSchemaEnum.DC.getName(), "requestcopy", "email", Item.ANY);
+        //grantorName = itemService.getMetadataFirstValue(ri.getItem(), MetadataSchemaEnum.DC.getName(), "requestcopy", "name", Item.ANY);
+
         if (grantors.isEmpty()) {
             grantorName = configurationService.getProperty("mail.admin.name");
             grantorAddress = configurationService.getProperty("mail.admin");
@@ -221,6 +233,16 @@ public void sendResponse(Context context, RequestItem ri, String subject,
                     context.restoreAuthSystemState();
                 }
                 email.send();
+
+                //Send email to grantor to let grantor know that email was sent out.
+                Email email_grantor = Email.getEmail(I18nUtil.getEmailFilename(context.getCurrentLocale(),
+                  "request_item.grantor" ));
+                //email_grantor.setSubject("Your email was sent out.");    
+                email_grantor.addRecipient(grantorAddress);
+                email_grantor.addArgument(ri.getReqName()); 
+                email_grantor.addArgument(ri.getReqEmail()); 
+                email_grantor.send();
+
             } else {
                 boolean sendRejectEmail = configurationService
                     .getBooleanProperty("request.item.reject.email", true);
@@ -228,6 +250,14 @@ public void sendResponse(Context context, RequestItem ri, String subject,
                 // email. However, by default, the rejection email is sent back.
                 if (sendRejectEmail) {
                     email.send();
+
+                  Email email_grantor = Email.getEmail(I18nUtil.getEmailFilename(context.getCurrentLocale(),
+                    "request_item.grantor" ));
+                  //email_grantor.setSubject("Your email was sent out.");
+                  email_grantor.addRecipient(grantorAddress);
+                  email_grantor.addArgument(ri.getReqName()); 
+                  email_grantor.addArgument(ri.getReqEmail()); 
+                  email_grantor.send();
                 }
             }
         } catch (MessagingException | IOException | SQLException | AuthorizeException e) {
diff --git a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
index 5874c2dc3cee..cd8c6520193e 100644
--- a/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
+++ b/dspace-api/src/main/java/org/dspace/xmlworkflow/XmlWorkflowServiceImpl.java
@@ -834,6 +834,16 @@ protected void notifyOfArchive(Context context, Item item, Collection coll)
                 }
                 email.addRecipient(ep.getEmail());
 
+                // If configed, send email to Deep Blue that shows deposit 
+                // item was deposited.
+                boolean sendToAdmin = configurationService.getBooleanProperty(
+                                    "deposit.notify.admin", false);
+                if ( sendToAdmin )
+                {
+                    email.addRecipient(configurationService.getProperty("feedback.recipient"));
+                } 
+
+
                 // UM Change To find out if there was a proxy depositor.
                 // For Proxie depoist.
                 String SubmitterMsg = "You submitted";
diff --git a/dspace/config/crosswalks/DIM2DataCite.xsl b/dspace/config/crosswalks/DIM2DataCite.xsl
index 3d87c4e31146..dcb046384076 100644
--- a/dspace/config/crosswalks/DIM2DataCite.xsl
+++ b/dspace/config/crosswalks/DIM2DataCite.xsl
@@ -3,24 +3,28 @@
 <!--
     Document   : DIM2DataCite.xsl
     Created on : January 23, 2013, 1:26 PM
-    Updated on : November 26, 2015, 3:00 PM
-    Author     : pbecker, ffuerste
-    Description: Converts metadata from DSpace Intermediat Format (DIM) into
-                 metadata following the DataCite Schema for the Publication and
-                 Citation of Research Data, Version 3.1
+    Updated on : Jaunary 30, 2024, 3:00 PM
+    Author     : pbecker, ffuerste, ypaulsen
+    Description: Converts metadata from DSpace Intermediate Format (DIM) into
+                 metadata following the DataCite Metadata Schema 4.5
 -->
 <xsl:stylesheet xmlns:xsl="http://www.w3.org/1999/XSL/Transform"
                 xmlns:dspace="http://www.dspace.org/xmlns/dspace/dim"
-                xmlns="http://datacite.org/schema/kernel-3"
+                xmlns="http://datacite.org/schema/kernel-4"
                 version="2.0">
     
     <!-- CONFIGURATION -->
     <!-- The parameters prefix, publisher, datamanager and hostinginstitution
          moved to DSpace's configuration. They will be substituted automatically.
-         It is not necessary anymore to change this file.
          Please take a look into the DSpace documentation for details on how to
          change those. -->
-    <!-- DO NOT CHANGE ANYTHING BELOW THIS LINE EXCEPT YOU REALLY KNOW WHAT YOU ARE DOING! -->
+    <!-- This file handles the transformation of metadata into the DataCite
+         Schema. You should customize it to match your local metadata schema
+         and submission forms. Please note that this must produce valid XML
+         according to the DataCite Schema. Otherwise you will not be able
+         to register DOIs anymore. Please follow and reuse the examples
+         included in this file. For more information on the DataCite
+         Schema, see https://schema.datacite.org. -->
     
     <!-- We need the prefix to determine DOIs that were minted by ourself. -->
     <xsl:param name="prefix">10.33577</xsl:param>
@@ -46,9 +50,9 @@
             properties are in the metadata of the item to export.
             The classe named above respects this.
         -->
-        <resource xmlns="http://datacite.org/schema/kernel-3"
-                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                  xsi:schemaLocation="http://datacite.org/schema/kernel-3 http://schema.datacite.org/meta/kernel-3/metadata.xsd">
+        <resource xmlns="http://datacite.org/schema/kernel-4"
+                xsi:schemaLocation="http://datacite.org/schema/kernel-4 http://schema.datacite.org/meta/kernel-4/metadata.xsd"
+                  xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
 
             <!--
                 MANDATORY PROPERTIES
@@ -65,7 +69,7 @@
                 company as well. We have to ensure to use URIs of our prefix
                 as primary identifiers only.
             -->
-            <xsl:apply-templates select="//dspace:field[@mdschema='dc' and @element='identifier' and starts-with(., concat('http://dx.doi.org/', $prefix))]" />
+            <xsl:apply-templates select="//dspace:field[@mdschema='dc' and @element='identifier' and @qualifier and (contains(., $prefix))]" />
 
             <!--
                 DataCite (2)
@@ -88,7 +92,7 @@
             <!--
                 DataCite (3)
                 Add Title information. 
-		Occ: 1-n
+        Occ: 1-n
             -->
             <titles>
                 <xsl:choose>
@@ -219,7 +223,17 @@
                 Template call for ResourceType
                 DataCite allows the ResourceType to ouccre not more than once.
             -->
-            <xsl:apply-templates select="(//dspace:field[@mdschema='dc' and @element='type'])[1]" />
+            <!--<xsl:apply-templates select="(//dspace:field[@mdschema='dc' and @element='type'])[1]" />-->
+            <xsl:choose>
+                <xsl:when test="(//dspace:field[@mdschema='dc' and @element='type'])[1]">
+                    <xsl:apply-templates select="(//dspace:field[@mdschema='dc' and @element='type'])[1]" />
+                </xsl:when>
+                <xsl:otherwise>
+                    <xsl:element name="resourceType">
+                        <xsl:attribute name="resourceTypeGeneral">Other</xsl:attribute>
+                    </xsl:element>
+                </xsl:otherwise>
+            </xsl:choose>
 
             <!-- 
                 DataCite (11)
@@ -230,14 +244,22 @@
                 Occ: 0-n
                 Required Attribute: alternateIdentifierType (free format)
             -->
-            <xsl:if test="//dspace:field[@mdschema='dc' and @element='identifier' and @qualifier and not(starts-with(., concat('http://dx.doi.org/', $prefix)))]">
+            <xsl:if test="//dspace:field[@mdschema='dc' and @element='identifier' and @qualifier and not(contains(., $prefix))]">
                 <xsl:element name="alternateIdentifiers">
-                    <xsl:apply-templates select="//dspace:field[@mdschema='dc' and @element='identifier' and @qualifier and not(starts-with(., concat('http://dx.doi.org/', $prefix)))]" />
+                    <xsl:apply-templates select="//dspace:field[@mdschema='dc' and @element='identifier' and @qualifier and not(contains(., $prefix))]" />
                 </xsl:element>
             </xsl:if>
 
             <!--
                 DataCite (12)
+                Add relatedIdentifier.
+                DataCite requires a relatedIdentifierType, but we do not know which
+                type of identifier is part of the dc.relation.* fields within DSpace.
+                Skip the related identifier until we find a proper solution.
+            -->
+
+            <!--
+                DataCite (13)
                 Add sizes.
             -->
             <xsl:if test="//dspace:field[@mdschema='dc' and @element='format' and @qualifier='extent']">             
@@ -246,7 +268,7 @@
                 </xsl:element>
             </xsl:if>
 
-            <!-- DataCite (13)
+            <!-- DataCite (14)
                  Add formats.
             -->
             <xsl:if test="//dspace:field[@mdschema='dc' and @element='format'][not(@qualifier='extent')]">
@@ -255,6 +277,13 @@
                 </xsl:element>
             </xsl:if>
 
+            <!--
+                 DataCite (15)
+                 Add version.
+                 As we currently do not link versions as related identifier, we skip
+                the version information too.
+            -->
+
             <!--
                 DataCite (16)
                 Rights.
@@ -283,7 +312,15 @@
                 GeoLocation
                 DSpace currently doesn't store geolocations.
             -->
-
+            <!--
+                DataCite (19)
+                FundingReference
+                DSpace currently doesn't store FundingReference.
+            -->
+            <!--
+                DataCite (20)
+                RelatedItem
+            -->
         </resource>
     </xsl:template>
 
@@ -295,9 +332,17 @@
         company as well. We have to ensure to use URIs of our prefix
         as primary identifiers only.
     -->
-    <xsl:template match="dspace:field[@mdschema='dc' and @element='identifier' and @qualifier and starts-with(., concat('http://dx.doi.org/', $prefix))]">
+    <xsl:template match="dspace:field[@mdschema='dc' and @element='identifier' and @qualifier and (contains(., $prefix))]">
         <identifier identifierType="DOI">
-            <xsl:value-of select="substring(., 19)"/>
+            <xsl:if test="starts-with(string(text()), 'https://doi.org/')">
+                <xsl:value-of select="substring(., 17)"/>
+            </xsl:if>
+            <xsl:if test="starts-with(string(text()), 'http://dx.doi.org/')">
+                <xsl:value-of select="substring(., 19)"/>
+        </xsl:if>
+        <xsl:if test="starts-with(string(text()), 'https://dx.doi.org/')">
+                <xsl:value-of select="substring(., 20)"/>
+            </xsl:if>
         </identifier>
     </xsl:template>
 
@@ -313,16 +358,20 @@
     <!-- DataCite (3) :: Title -->
     <xsl:template match="dspace:field[@mdschema='dc' and @element='title']">
         <xsl:element name="title">
+            <xsl:attribute name="xml:lang">en-US</xsl:attribute>
             <xsl:if test="@qualifier='alternative'">
+                <xsl:attribute name="xml:lang">en-US</xsl:attribute>
                 <xsl:attribute name="titleType">AlternativeTitle</xsl:attribute>
             </xsl:if>
             <!-- DSpace does include niehter a dc.title.subtitle nor a 
                  dc.title.translated. If necessary, please create those in the 
                  metadata field registry. -->
             <xsl:if test="@qualifier='subtitle'">
+                <xsl:attribute name="xml:lang">en-US</xsl:attribute>
                 <xsl:attribute name="titleType">Subtitle</xsl:attribute>
             </xsl:if>
             <xsl:if test="@qualifier='translated'">
+                <xsl:attribute name="xml:lang">en-US</xsl:attribute>
                 <xsl:attribute name="titleType">TranslatedTitle</xsl:attribute>
             </xsl:if>
             <xsl:value-of select="." />
@@ -341,6 +390,7 @@
     -->
     <xsl:template match="//dspace:field[@mdschema='dc' and @element='subject']">
         <xsl:element name="subject">
+            <xsl:attribute name="xml:lang">en-US</xsl:attribute>
             <xsl:if test="@qualifier">
                 <xsl:attribute name="subjectScheme"><xsl:value-of select="@qualifier" /></xsl:attribute>
             </xsl:if>
@@ -409,7 +459,7 @@
                          or @qualifier='issued' 
                          or @qualifier='submitted'
                          or @qualifier='updated')]">
-    	<xsl:if test="@qualifier='accessioned' 
+        <xsl:if test="@qualifier='accessioned' 
                         or @qualifier='available' 
                         or @qualifier='copyright' 
                         or @qualifier='created' 
@@ -436,14 +486,14 @@
                      dissertations. DataCite uses submitted for the "date the 
                      creator submits the resource to the publisher". -->
                 <xsl:if test="@qualifier='submitted'">
-                    <xsl:attribute name="dateType">Issued</xsl:attribute>
+                    <xsl:attribute name="dateType">Submitted</xsl:attribute>
                 </xsl:if>
                 <xsl:if test="@qualifier='updated'">
                     <xsl:attribute name="dateType">Updated</xsl:attribute>
                 </xsl:if>
-	    	<xsl:value-of select="substring(., 1, 10)" />
+            <xsl:value-of select="substring(., 1, 10)" />
             </xsl:element>
-	</xsl:if>
+    </xsl:if>
     </xsl:template>
 
     <!--
@@ -457,8 +507,7 @@
                 <xsl:when test="contains(string(text()), '_')">
                     <xsl:value-of select="translate(string(text()), '_', '-')"/>
                 </xsl:when>
-                <xsl:otherwise>
-                    <xsl:value-of select="string(text())"/>
+                <xsl:otherwise>en-US
                 </xsl:otherwise>
             </xsl:choose>
         </xsl:element>
@@ -473,9 +522,9 @@
             <xsl:attribute name="resourceTypeGeneral">
                 <xsl:choose>
                     <xsl:when test="string(text())='Animation'">Audiovisual</xsl:when>
-                    <xsl:when test="string(text())='Article'">Text</xsl:when>
-                    <xsl:when test="string(text())='Book'">Text</xsl:when>
-                    <xsl:when test="string(text())='Book chapter'">Text</xsl:when>
+                    <xsl:when test="string(text())='Article'">JournalArticle</xsl:when>
+                    <xsl:when test="string(text())='Book'">Book</xsl:when>
+                    <xsl:when test="string(text())='Book chapter'">BookChapter</xsl:when>
                     <xsl:when test="string(text())='Dataset'">Dataset</xsl:when>
                     <xsl:when test="string(text())='Learning Object'">InteractiveResource</xsl:when>
                     <xsl:when test="string(text())='Image'">Image</xsl:when>
@@ -483,21 +532,21 @@
                     <xsl:when test="string(text())='Map'">Model</xsl:when>
                     <xsl:when test="string(text())='Musical Score'">Other</xsl:when>
                     <xsl:when test="string(text())='Plan or blueprint'">Model</xsl:when>
-                    <xsl:when test="string(text())='Preprint'">Text</xsl:when>
-                    <xsl:when test="string(text())='Presentation'">Text</xsl:when>
+                    <xsl:when test="string(text())='Preprint'">Preprint</xsl:when>
+                    <xsl:when test="string(text())='Presentation'">Other</xsl:when>
                     <xsl:when test="string(text())='Recording, acoustical'">Sound</xsl:when>
                     <xsl:when test="string(text())='Recording, musical'">Sound</xsl:when>
                     <xsl:when test="string(text())='Recording, oral'">Sound</xsl:when>
                     <xsl:when test="string(text())='Software'">Software</xsl:when>
-                    <xsl:when test="string(text())='Technical Report'">Text</xsl:when>
-                    <xsl:when test="string(text())='Thesis'">Text</xsl:when>
+                    <xsl:when test="string(text())='Technical Report'">Report</xsl:when>
+                    <xsl:when test="string(text())='Thesis'">Dissertation</xsl:when>
                     <xsl:when test="string(text())='Video'">Audiovisual</xsl:when>
                     <xsl:when test="string(text())='Working Paper'">Text</xsl:when>
                     <xsl:when test="string(text())='Other'">Other</xsl:when>
                     <xsl:otherwise>Other</xsl:otherwise>
                 </xsl:choose>
             </xsl:attribute>
-            <xsl:value-of select="." />
+            <!-- <xsl:value-of select="." /> -->
         </xsl:element>
     </xsl:template>
 
@@ -512,7 +561,7 @@
         resolveUrlToHandle(context, altId) until one is recognized or all have
         been tested.
     -->
-    <xsl:template match="//dspace:field[@mdschema='dc' and @element='identifier' and @qualifier and not(starts-with(., concat('http://dx.doi.org/', $prefix)))]">
+    <xsl:template match="//dspace:field[@mdschema='dc' and @element='identifier' and @qualifier and not(contains(., $prefix))]">
         <xsl:element name="alternateIdentifier">
             <xsl:if test="@qualifier">
                 <xsl:attribute name="alternateIdentifierType"><xsl:value-of select="@qualifier" /></xsl:attribute>
@@ -561,20 +610,9 @@
         Adds Rights information
     -->
     <xsl:template match="//dspace:field[@mdschema='dc' and @element='rights']">
-        <xsl:choose>
-            <xsl:when test="@qualifier='uri'">
-                <xsl:element name="rights">
-                    <xsl:attribute name="rightsURI">
-                        <xsl:value-of select="." />
-                    </xsl:attribute>
-                </xsl:element>
-            </xsl:when>
-            <xsl:otherwise>
-                <xsl:element name="rights">
-                    <xsl:value-of select="." />
-                </xsl:element>
-            </xsl:otherwise>
-        </xsl:choose>
+        <xsl:element name="rights">
+            <xsl:value-of select="." />
+        </xsl:element>
     </xsl:template>
 
     <!--
@@ -583,11 +621,12 @@
     -->
     <xsl:template match="//dspace:field[@mdschema='dc' and @element='description' and (@qualifier='abstract' or @qualifier='tableofcontents' or not(@qualifier))]">
         <xsl:element name="description">
+            <xsl:attribute name="xml:lang">en-US</xsl:attribute>
             <xsl:attribute name="descriptionType">
-           	<xsl:choose>
+            <xsl:choose>
                     <xsl:when test="@qualifier='abstract'">Abstract</xsl:when>
                     <xsl:when test="@qualifier='tableofcontents'">TableOfContents</xsl:when>
-               	    <xsl:otherwise>Other</xsl:otherwise>
+                    <xsl:otherwise>Other</xsl:otherwise>
                 </xsl:choose>
             </xsl:attribute>
             <xsl:value-of select="." />
diff --git a/dspace/config/emails/request_item.granted b/dspace/config/emails/request_item.granted
index 37ee5c29bd0c..bc3acad7cda4 100644
--- a/dspace/config/emails/request_item.granted
+++ b/dspace/config/emails/request_item.granted
@@ -23,4 +23,4 @@ ${params[5]}
 #end
 
 Best regards,
-The ${config.get('dspace.name')} Team
+The Deep Blue Documents Team
diff --git a/dspace/config/emails/request_item.grantor b/dspace/config/emails/request_item.grantor
new file mode 100644
index 000000000000..495f40a2bdb2
--- /dev/null
+++ b/dspace/config/emails/request_item.grantor
@@ -0,0 +1,11 @@
+## Sent to the person requesting a copy of a restricted document when the
+## request is granted.
+##
+## Parameters:
+##  {0} name of person requesting the item
+##  {1} email of person requesting the item
+#set($subject = 'Your email was sent out.')
+
+
+Your response to ${params[0]} (${params[1]}) was sent out.
+
diff --git a/dspace/config/emails/request_item.rejected b/dspace/config/emails/request_item.rejected
index c5a13860b648..a98072faf59f 100644
--- a/dspace/config/emails/request_item.rejected
+++ b/dspace/config/emails/request_item.rejected
@@ -23,4 +23,4 @@ ${params[5]}
 #end
 
 Best regards,
-The ${config.get('dspace.name')} Team
+The Deep Blue Documents Team
diff --git a/dspace/config/item-submission.xml b/dspace/config/item-submission.xml
index 415d85b35563..0b08e0654de6 100644
--- a/dspace/config/item-submission.xml
+++ b/dspace/config/item-submission.xml
@@ -19,9 +19,11 @@
     <submission-map>
         <!-- Default submission process -->
         <name-map collection-handle="default"     submission-name="traditional"/>
+        <name-map collection-handle="123456789/109"  submission-name="traditionalCC_um" />
+
 <!--
 
-<name-map collection-handle="123456789/2"  submission-name="traditionalCC_um" />
+
 
    <name-map collection-handle="2027.42/64026"  submission-name="busadisp" />
    <name-map collection-handle="2027.42/49252"  submission-name="biostation" />
diff --git a/dspace/config/modules/oai.cfg b/dspace/config/modules/oai.cfg
index 06ee17fa1ac9..9db56e118bc0 100644
--- a/dspace/config/modules/oai.cfg
+++ b/dspace/config/modules/oai.cfg
@@ -21,8 +21,8 @@ oai.storage=solr
 
 # The base URL of the OAI webapp (do not include the context e.g. /request, /openaire, etc).
 # Note: Comment out if you want to fallback to the request's URL.
-#oai.url = ${dspace.server.url}/${oai.path}
-oai.url = http://localhost:8080/server/oai
+oai.url = ${dspace.server.url}/${oai.path}
+#oai.url = http://localhost:8080/server/oai
 
 
 # Base solr index
@@ -38,12 +38,13 @@ oai.solr.url=${solr.server}/${solr.multicorePrefix}oai
 # DSpace will set this configuration to the hostname from your ${dspace.ui.url} configuration.
 # However, you may override that default value by uncommenting this configuration.
 #oai.identifier.prefix = YOUR_SITE_HOSTNAME
-oai.identifier.prefix = http://localhost:4000
+oai.identifier.prefix = deepblue.lib.umich.edu
 
 # Base url for bitstreams
 #oai.bitstream.baseUrl = ${dspace.ui.url}
-#oai.bitstream.baseUrl = https://dev.deepblue.lib.umich.edu
-oai.bitstream.baseUrl = http://localhost:4000
+oai.bitstream.baseUrl = https://deepblue.lib.umich.edu
+#oai.bitstream.baseUrl = http://localhost:4000
+
 
 # Base Configuration Directory
 #oai.config.dir = ${dspace.dir}/config/crosswalks/oai
diff --git a/dspace/config/submission-forms.xml b/dspace/config/submission-forms.xml
index f37c08f52562..b277a13254c1 100644
--- a/dspace/config/submission-forms.xml
+++ b/dspace/config/submission-forms.xml
@@ -416,7 +416,7 @@
                      <dc-qualifier>ispartofseries</dc-qualifier>
                      <repeatable>true</repeatable>
                      <label>Series/Report No./Version</label>
-                     <input-type>onebox</input-type>
+                     <input-type>twobox</input-type>
                      <hint>Any series, number, version, or release assigned to this item.</hint>
                      <required></required>
                 </field>
@@ -485,7 +485,7 @@
                      <!-- An input-type of twobox MUST be marked as repeatable -->
                      <repeatable>true</repeatable>
                      <label>Subject Keywords</label>
-                     <input-type>onebox</input-type>
+                     <input-type>twobox</input-type>
                      <hint>Enter subject keywords or phrases here.</hint>
                      <required></required>
                 </field>
@@ -741,7 +741,7 @@
                      <!-- An input-type of twobox MUST be marked as repeatable -->
                      <repeatable>true</repeatable>
                      <label>Environment</label>
-                     <input-type>onebox</input-type>
+                     <input-type>twobox</input-type>
                      <hint>Enter environment (e.g. "Northern Hardwoods")</hint>
                      <required></required>
                 </field>
@@ -755,7 +755,7 @@
                      <!-- An input-type of twobox MUST be marked as repeatable -->
                      <repeatable>true</repeatable>
                      <label>Subject</label>
-                     <input-type>onebox</input-type>
+                     <input-type>twobox</input-type>
                      <hint>Enter subject here.</hint>
                      <required></required>
                 </field>
@@ -769,7 +769,7 @@
                      <!-- An input-type of twobox MUST be marked as repeatable -->
                      <repeatable>true</repeatable>
                      <label>Keywords</label>
-                     <input-type>onebox</input-type>
+                     <input-type>twobox</input-type>
                      <hint>Enter keywords or phrases here.</hint>
                      <required></required>
                 </field>
@@ -1064,7 +1064,7 @@
                      <dc-qualifier></dc-qualifier>
                      <repeatable>true</repeatable>
                      <label>Keywords or short phrases</label>
-                     <input-type>onebox</input-type>
+                     <input-type>twobox</input-type>
                      <hint>Up to six keywords/short phrases describing your thesis</hint>
                      <required></required>
                 </field>
@@ -1110,6 +1110,20 @@
                      <required>University, degree grantor is required</required>
                 </field>
             </row>
+
+            <row>
+                <field>
+                    <dc-schema>dc</dc-schema>
+                    <dc-element>description</dc-element>
+                    <dc-qualifier>mapping</dc-qualifier>
+                    <repeatable>true</repeatable>
+                    <label>Display in Other Collections</label>
+                    <input-type value-pairs-name="collection_mappings">dropdown</input-type>
+                    <hint>If you are also a depositor in another collection and you'd like to associate your work with it, you may select the collection(s) here (e.g. a thesis may be added to the general thesis collection as well as appear in the relevant departmental collection(s) ). This box will be blank if you are not a depositor in other collections</hint> 
+                    <required></required>
+                </field>
+            </row>
+
        </form>
 
 
@@ -1264,7 +1278,7 @@
                      <dc-qualifier>ispartofseries</dc-qualifier>
                      <repeatable>true</repeatable>
                      <label>Series/Report No./Version</label>
-                     <input-type>onebox</input-type>
+                     <input-type>twobox</input-type>
                      <hint>Any series, number, version, or release assigned to this item.</hint>
                      <required></required>
                 </field>
@@ -1318,7 +1332,7 @@
                      <!-- An input-type of twobox MUST be marked as repeatable -->
                      <repeatable>true</repeatable>
                      <label>Subject Keywords</label>
-                     <input-type>onebox</input-type>
+                     <input-type>twobox</input-type>
                      <hint>Enter subject keywords or phrases here.</hint>
                      <required></required>
                 </field>
@@ -1651,7 +1665,7 @@
                      <dc-qualifier></dc-qualifier>
                      <repeatable>true</repeatable>
                      <label>Keyword</label>
-                     <input-type>onebox</input-type>
+                     <input-type>twobox</input-type>
                      <hint>Req'd: Enter ONE word or phrase per text box, up to 9 keyword fields</hint>
                      <required>Three keywords are required</required>
                 </field>
@@ -2038,7 +2052,7 @@
                      <dc-qualifier></dc-qualifier>
                      <repeatable>true</repeatable>
                      <label>Keywords or short phrases</label>
-                     <input-type>onebox</input-type>
+                     <input-type>twobox</input-type>
                      <hint>Up to six keywords/short phrases describing your thesis</hint>
                      <required></required>
                 </field>
@@ -2530,7 +2544,7 @@
                       <!-- An input-type of twobox MUST be marked as repeatable -->
                       <repeatable>true</repeatable>
                       <label>Subject Keywords</label>
-                      <input-type>onebox</input-type>
+                      <input-type>twobox</input-type>
                       <hint>Enter subject keywords or phrases here.</hint>
                       <required></required>
                 </field>