From 80e5e12f29d95cd161162fb21886e4daed496b60 Mon Sep 17 00:00:00 2001 From: Aldo Mihasi Date: Tue, 8 Feb 2022 14:04:26 +0200 Subject: [PATCH] fix export-import dataset missing rda mappings --- .../ExportXmlBuilderDatasetProfile.java | 5 +++++ .../datasetProfileModel/Fields/Field.java | 12 ++++++++++++ 2 files changed, 17 insertions(+) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java index 97cc158aa..f818ee50b 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/ExportXmlBuilderDatasetProfile.java @@ -163,6 +163,11 @@ public class ExportXmlBuilderDatasetProfile { numbering.setTextContent(field.getNumbering()); elementField.appendChild(numbering); } + if (field.getRdaProperty() != null) { + Element rdaProperty = element.createElement("rdaProperty"); + rdaProperty.setTextContent(field.getRdaProperty()); + elementField.appendChild(rdaProperty); + } if (field.getValidations() != null) { Element validations = element.createElement("validations"); field.getValidations().forEach(validation -> { diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java index a4cce3d02..89e66e869 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Fields/Field.java @@ -29,6 +29,8 @@ public class Field { private Object data; + private String rdaProperty; + @XmlAttribute(name = "id") public String getId() { return id; @@ -101,6 +103,15 @@ public class Field { this.data = data; } + @XmlElement(name = "rdaProperty") + public String getRdaProperty() { + return rdaProperty; + } + + public void setRdaProperty(String rdaProperty) { + this.rdaProperty = rdaProperty; + } + public eu.eudat.models.data.admin.components.datasetprofile.Field toAdminCompositeModelSection() { eu.eudat.models.data.admin.components.datasetprofile.Field fieldEntity =new eu.eudat.models.data.admin.components.datasetprofile.Field(); @@ -120,6 +131,7 @@ public class Field { if (data != null) { fieldEntity.setData(data.toMap((Element) this.data)); } + fieldEntity.setRdaCommonStandard(this.rdaProperty); return fieldEntity; } }