Skip to content

5546-escape file metadata going to DataCite #5548

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.

Sign up for GitHub

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

Merged
kcondon merged 1 commit into from
Feb 15, 2019
Merged

5546-escape file metadata going to DataCite #5548

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions src/main/java/edu/harvard/iq/dataverse/DOIDataCiteRegisterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@
import javax.persistence.EntityManager;
import javax.persistence.PersistenceContext;
import javax.persistence.TypedQuery;
import org.apache.commons.lang.StringEscapeUtils;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element;
Expand Down Expand Up @@ -149,7 +150,9 @@ public static String getMetadataFromDvObject(String identifier, Map<String, Stri
}
if (dvObject.isInstanceofDataFile()) {
DataFile df = (DataFile) dvObject;
String fileDescription = df.getDescription();
//Note: File metadata is not escaped like dataset metadata is, so adding an xml escape here.
//This could/should be removed if the datafile methods add escaping
String fileDescription = StringEscapeUtils.escapeXml(df.getDescription());
metadataTemplate.setDescription(fileDescription == null ? "" : fileDescription);
String datasetPid = df.getOwner().getGlobalId().asString();
metadataTemplate.setDatasetIdentifier(datasetPid);
Expand All @@ -159,7 +162,12 @@ public static String getMetadataFromDvObject(String identifier, Map<String, Stri

metadataTemplate.setContacts(dataset.getLatestVersion().getDatasetContacts());
metadataTemplate.setProducers(dataset.getLatestVersion().getDatasetProducers());
metadataTemplate.setTitle(dvObject.getDisplayName());
String title = dvObject.getDisplayName();
if(dvObject.isInstanceofDataFile()) {
//Note file title is not currently escaped the way the dataset title is, so adding it here.
title = StringEscapeUtils.escapeXml(title);
}
metadataTemplate.setTitle(title);
String producerString = dataset.getLatestVersion().getRootDataverseNameforCitation();
if (producerString.isEmpty()) {
producerString = ":unav";
Expand Down