From beac4a9e1d59acaa4db65862f7dfabdb7665472c Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Wed, 13 Feb 2019 10:41:41 -0500
Subject: [PATCH 1/3] #4837 get correct dataset title to pass to PID provider

---
 .../harvard/iq/dataverse/AbstractGlobalIdServiceBean.java    | 2 +-
 src/main/java/edu/harvard/iq/dataverse/DataFile.java         | 5 +++++
 src/main/java/edu/harvard/iq/dataverse/Dataset.java          | 5 +++++
 src/main/java/edu/harvard/iq/dataverse/Dataverse.java        | 5 +++++
 src/main/java/edu/harvard/iq/dataverse/DvObject.java         | 2 ++
 5 files changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java
index 98310a136b5..0d4ee29ef95 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java
@@ -68,7 +68,7 @@ protected Map<String, String> addBasicMetadata(DvObject dvObjectIn, Map<String,
         }
         
         metadata.put("datacite.creator", authorString);
-        metadata.put("datacite.title", dvObjectIn.getDisplayName());
+        metadata.put("datacite.title", dvObjectIn.getCurrentName());
         metadata.put("datacite.publisher", producerString);
         metadata.put("datacite.publicationyear", generateYear(dvObjectIn));        
         return metadata;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DataFile.java b/src/main/java/edu/harvard/iq/dataverse/DataFile.java
index c85d6efffaa..fa020d24bc5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DataFile.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DataFile.java
@@ -722,6 +722,11 @@ public String getDisplayName() {
        return getLatestFileMetadata().getLabel(); 
     }
     
+    @Override 
+    public String getCurrentName(){
+        return getLatestFileMetadata().getLabel();
+    }
+    
     @Override
     public int compareTo(Object o) {
         DataFile other = (DataFile) o;
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataset.java b/src/main/java/edu/harvard/iq/dataverse/Dataset.java
index ca410bc0f2a..313c3aef718 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataset.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataset.java
@@ -749,6 +749,11 @@ public String getDisplayName() {
         DatasetVersion dsv = getReleasedVersion();
         return dsv != null ? dsv.getTitle() : getLatestVersion().getTitle();
     }
+    
+    @Override
+    public String getCurrentName(){
+        return getLatestVersion().getTitle();
+    }
 
     @Override
     protected boolean isPermissionRoot() {
diff --git a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
index f74cb096d1b..390d97a6057 100644
--- a/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
+++ b/src/main/java/edu/harvard/iq/dataverse/Dataverse.java
@@ -729,6 +729,11 @@ public String getDisplayName() {
         return getName();
     }
     
+    @Override
+    public String getCurrentName() {
+        return getName();
+    }
+    
     @Override
     public boolean isPermissionRoot() {
         return permissionRoot;
diff --git a/src/main/java/edu/harvard/iq/dataverse/DvObject.java b/src/main/java/edu/harvard/iq/dataverse/DvObject.java
index 6286985ff76..726986027d5 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DvObject.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DvObject.java
@@ -359,6 +359,8 @@ protected String toStringExtras() {
     
     public abstract String getDisplayName();
     
+    public abstract String getCurrentName();
+    
     // helper method used to mimic instanceof on JSF pge
     public boolean isInstanceofDataverse() {
         return this instanceof Dataverse;

From 120ac1affd93f4025d777608dc695da0e7552a8a Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 14 Feb 2019 16:44:43 -0500
Subject: [PATCH 2/3] #4837 fix getMetadata for DataCite

---
 .../edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java    | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java b/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
index 50f92f81fb5..ecd2155708c 100644
--- a/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
+++ b/src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
@@ -159,7 +159,7 @@ public static String getMetadataFromDvObject(String identifier, Map<String, Stri
 
         metadataTemplate.setContacts(dataset.getLatestVersion().getDatasetContacts());
         metadataTemplate.setProducers(dataset.getLatestVersion().getDatasetProducers());
-        metadataTemplate.setTitle(dvObject.getDisplayName());
+        metadataTemplate.setTitle(dvObject.getCurrentName());
         String producerString = dataset.getLatestVersion().getRootDataverseNameforCitation();
         if (producerString.isEmpty()) {
             producerString = ":unav";

From eb2c1dba18e0f7b35d43a9b85bcd25cd6ba19585 Mon Sep 17 00:00:00 2001
From: Stephen Kraffmiller <skraffmiller@hmdc.harvard.edu>
Date: Thu, 14 Feb 2019 17:00:00 -0500
Subject: [PATCH 3/3] #4837 get title from current name

---
 .../edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java b/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java
index 0d4ee29ef95..1dfc97bcd85 100644
--- a/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java
+++ b/src/main/java/edu/harvard/iq/dataverse/AbstractGlobalIdServiceBean.java
@@ -416,7 +416,7 @@ public String getMetadataFromDvObject(String identifier, Map<String, String> met
 
         metadataTemplate.setContacts(dataset.getLatestVersion().getDatasetContacts());
         metadataTemplate.setProducers(dataset.getLatestVersion().getDatasetProducers());
-        metadataTemplate.setTitle(dvObject.getDisplayName());
+        metadataTemplate.setTitle(dvObject.getCurrentName());
         String producerString = dataverseService.findRootDataverse().getName();
         if (producerString.isEmpty()) {
             producerString = ":unav";