Skip to content

Fixes the self-resetting display format on the rel. pub. url #6247

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 2 commits into from
Oct 2, 2019
Merged

Fixes the self-resetting display format on the rel. pub. url #6247

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a5f9592
Fixed the bug in the schema.org export which, under some conditions, …
landreev Oct 2, 2019
c528524
edited a comment (#6202)
landreev Oct 2, 2019
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
16 changes: 12 additions & 4 deletions src/main/java/edu/harvard/iq/dataverse/DatasetVersion.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,6 +49,7 @@
import javax.validation.Validator;
import javax.validation.ValidatorFactory;
import javax.validation.constraints.Size;
import org.apache.commons.lang.StringUtils;

/**
*
Expand Down Expand Up @@ -1141,10 +1142,17 @@ public List<DatasetRelPublication> getRelatedPublications() {
relatedPublication.setText(citation);
}
if (subField.getDatasetFieldType().getName().equals(DatasetFieldConstant.publicationURL)) {
// Prevent href and target=_blank from getting into Schema.org JSON-LD output.
subField.getDatasetFieldType().setDisplayFormat("#VALUE");
String url = subField.getDisplayValue();
relatedPublication.setUrl(url);
// We have to avoid using subField.getDisplayValue() here - because the DisplayFormatType
// for this url metadata field is likely set up so that the display value is automatically
// turned into a clickable HTML HREF block, which we don't want to end in our Schema.org JSON-LD output.
// So we want to use the raw value of the field instead, with
// minimal HTML sanitation, just in case (this would be done on all URLs in getDisplayValue()).
String url = subField.getValue();
if (StringUtils.isBlank(url) || DatasetField.NA_VALUE.equals(url)) {
relatedPublication.setUrl("");
} else {
relatedPublication.setUrl(MarkupChecker.sanitizeBasicHTML(url));
}
}
}
relatedPublications.add(relatedPublication);
Expand Down