Skip to content
Snippets Groups Projects
Commit e0fa01f7 authored by Stefan E. Funk's avatar Stefan E. Funk
Browse files

fix: remove empty subject tags in openaire response

parent 9f5d8f2e
No related branches found
No related tags found
No related merge requests found
Pipeline #342450 passed
...@@ -154,6 +154,7 @@ public class RecordDelivererDC extends RecordDelivererAbstract { ...@@ -154,6 +154,7 @@ public class RecordDelivererDC extends RecordDelivererAbstract {
*/ */
private GetResponse furtherDCElements(String id) { private GetResponse furtherDCElements(String id) {
// TODO WHY adding .0 here??
if (!id.endsWith(".0")) { if (!id.endsWith(".0")) {
id = id.concat(".0"); id = id.concat(".0");
} }
......
...@@ -269,12 +269,21 @@ public class RecordDelivererDatacite extends RecordDelivererAbstract { ...@@ -269,12 +269,21 @@ public class RecordDelivererDatacite extends RecordDelivererAbstract {
if (this.textgrid) { if (this.textgrid) {
Subject subject = new Subject(); Subject subject = new Subject();
subject.setValue( String value =
OaipmhUtilities.firstEnrtryFieldLoader(this.jsonObj, subjectField + ".value")); OaipmhUtilities.firstEnrtryFieldLoader(this.jsonObj, subjectField + ".value");
subject.setSchemeURI( if (!value.isEmpty()) {
OaipmhUtilities.firstEnrtryFieldLoader(this.jsonObj, subjectField + ".id.type")); subject.setValue(value);
subject.setSubjectScheme( }
OaipmhUtilities.firstEnrtryFieldLoader(this.jsonObj, subjectField + ".id.value")); String scheme =
OaipmhUtilities.firstEnrtryFieldLoader(this.jsonObj, subjectField + ".id.value");
if (!scheme.isEmpty()) {
subject.setSubjectScheme(scheme);
}
String schemeURI =
OaipmhUtilities.firstEnrtryFieldLoader(this.jsonObj, subjectField + ".id.type");
if (schemeURI.isEmpty()) {
subject.setSchemeURI(schemeURI);
}
subjects.getSubject().add(subject); subjects.getSubject().add(subject);
} }
...@@ -286,10 +295,11 @@ public class RecordDelivererDatacite extends RecordDelivererAbstract { ...@@ -286,10 +295,11 @@ public class RecordDelivererDatacite extends RecordDelivererAbstract {
List<String> sList = OaipmhUtilities.listFieldLoader(this.jsonObj, subjectField); List<String> sList = OaipmhUtilities.listFieldLoader(this.jsonObj, subjectField);
for (String s : sList) { for (String s : sList) {
Subject subject = new Subject(); Subject subject = new Subject();
subject.setValue(s); if (!s.isEmpty()) {
// TODO Extract subject schema and schema URI somehow? subject.setValue(s);
// subject.setSchemeURI(); }
// subject.setSubjectScheme(); // TODO Extract subject schema and schema URI somehow? Set accordingly like in TG part
// above.
subjects.getSubject().add(subject); subjects.getSubject().add(subject);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment