Skip to content

Improve DataCiteXML robustness w.r.t. ROR #11782

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
merged 6 commits into from
Oct 9, 2025
Merged

Improve DataCiteXML robustness w.r.t. ROR #11782

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
fcb8b9d
check for string
qqmyers Aug 29, 2025
05b68c6
and another
qqmyers Aug 26, 2025
f8757b4
fix termName parsing
qqmyers Sep 4, 2025
b47a555
Merge remote-tracking branch 'IQSS/develop' into QDR-DataCiteRORError…
qqmyers Sep 4, 2025
f7157ef
add null check
qqmyers Sep 4, 2025
57e078e
Merge remote-tracking branch 'IQSS/develop' into QDR-DataCiteRORError…
qqmyers Sep 25, 2025
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
1 change: 1 addition & 0 deletions src/main/java/edu/harvard/iq/dataverse/export/ExportService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -312,6 +312,7 @@ public void exportAllFormats(Dataset dataset) throws ExportException {
} catch (ServiceConfigurationError serviceError) {
throw new ExportException("Service configuration error during export. " + serviceError.getMessage());
} catch (RuntimeException e) {
e.printStackTrace();
logger.log(Level.FINE, e.getMessage(), e);
throw new ExportException(
"Unknown runtime exception exporting metadata. " + (e.getMessage() == null ? "" : e.getMessage()));
Expand Down
4 changes: 3 additions & 1 deletion src/main/java/edu/harvard/iq/dataverse/pidproviders/doi/XmlMetadataTemplate.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,7 @@
import edu.harvard.iq.dataverse.util.xml.XmlWriterUtil;
import jakarta.enterprise.inject.spi.CDI;
import jakarta.json.JsonObject;
import jakarta.json.JsonValue.ValueType;

public class XmlMetadataTemplate {

Expand Down Expand Up @@ -621,7 +622,8 @@ private void writeEntityElements(XMLStreamWriter xmlw, String elementName, Strin
if (externalIdentifier.isValidIdentifier(orgName)) {
isROR = true;
JsonObject jo = getExternalVocabularyValue(orgName);
if (jo != null) {
// Some ext. cvv configs store a JsonArray of multiple objects/values. In such cases, we'll leave orgName blank
if (jo != null && jo.getValueType() == ValueType.STRING) {
orgName = jo.getString("termName");
}
}
Expand Down
Loading