Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

#4837 get correct dataset title to pass to PID provider #5533

Merged
merged 8 commits into from Mar 20, 2019
Expand Up @@ -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;
Expand Down Expand Up @@ -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";
Expand Down
Expand Up @@ -162,7 +162,7 @@ public static String getMetadataFromDvObject(String identifier, Map<String, Stri

metadataTemplate.setContacts(dataset.getLatestVersion().getDatasetContacts());
metadataTemplate.setProducers(dataset.getLatestVersion().getDatasetProducers());
String title = dvObject.getDisplayName();
String title = dvObject.getCurrentName();
if(dvObject.isInstanceofDataFile()) {
//Note file title is not currently escaped the way the dataset title is, so adding it here.
title = StringEscapeUtils.escapeXml(title);
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/edu/harvard/iq/dataverse/DataFile.java
Expand Up @@ -749,6 +749,11 @@ public String getDisplayName() {
return getLatestFileMetadata().getLabel();
}

@Override
public String getCurrentName(){
return getLatestFileMetadata().getLabel();
}

@Override
public int compareTo(Object o) {
DataFile other = (DataFile) o;
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/edu/harvard/iq/dataverse/Dataset.java
Expand Up @@ -773,6 +773,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() {
Expand Down
5 changes: 5 additions & 0 deletions src/main/java/edu/harvard/iq/dataverse/Dataverse.java
Expand Up @@ -729,6 +729,11 @@ public String getDisplayName() {
return getName();
}

@Override
public String getCurrentName() {
return getName();
}

@Override
public boolean isPermissionRoot() {
return permissionRoot;
Expand Down
2 changes: 2 additions & 0 deletions src/main/java/edu/harvard/iq/dataverse/DvObject.java
Expand Up @@ -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;
Expand Down