diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java index cec5df6f1..2ae1a2d34 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/DatasetProfile.java @@ -52,7 +52,9 @@ public class DatasetProfile { List sectionDatasetEntity = new LinkedList<>(); for (Page xmlPage: page) { pagesDatasetEntity.add(xmlPage.toAdminCompositeModelPage()); - sectionDatasetEntity.add(xmlPage.toAdminCompositeModelSection()); + for (int i = 0; i < xmlPage.getSections().size(); i++) { + sectionDatasetEntity.add(xmlPage.toAdminCompositeModelSection(i)); + } } newDatasetEntityProfile.setPages(pagesDatasetEntity); newDatasetEntityProfile.setSections(sectionDatasetEntity); diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Page.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Page.java index b30f82d29..5ef139834 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Page.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/xml/datasetProfileXml/datasetProfileModel/Page.java @@ -3,13 +3,14 @@ package eu.eudat.logic.utilities.documents.xml.datasetProfileXml.datasetProfileM import javax.xml.bind.annotation.XmlAttribute; import javax.xml.bind.annotation.XmlElement; import javax.xml.bind.annotation.XmlRootElement; +import java.util.List; @XmlRootElement(name = "page") public class Page { private String id; private int ordinal; private String title; - private Sections sections; + private List sections; @XmlAttribute(name = "id") public String getId() { @@ -39,11 +40,11 @@ public class Page { } @XmlElement(name = "sections") - public Sections getSections() { + public List getSections() { return sections; } - public void setSections(Sections sections) { + public void setSections(List sections) { this.sections = sections; } @@ -55,7 +56,7 @@ public class Page { return pageEntity; } - public eu.eudat.models.data.admin.components.datasetprofile.Section toAdminCompositeModelSection(){ + public eu.eudat.models.data.admin.components.datasetprofile.Section toAdminCompositeModelSection(int i){ /* eu.eudat.models.data.admin.components.datasetprofile.Section sectionEntity =new eu.eudat.models.data.admin.components.datasetprofile.Section(); // List sectionsListEntity = new LinkedList<>(); // for (Section xmlsection:this.sections.section) { @@ -68,6 +69,6 @@ public class Page { sectionEntity.setId(this.id); sectionEntity.setOrdinal(this.ordinal); sectionEntity.setTitle(this.title);*/ - return sections.toAdminCompositeModelSection(); + return sections.get(i).toAdminCompositeModelSection(); } }