From 13e62fd40921d3edffddf2d5df8cf95e7c58a3a4 Mon Sep 17 00:00:00 2001 From: "konstantina.galouni" Date: Tue, 28 Feb 2023 11:01:44 +0200 Subject: [PATCH] h2020.docx & WordBuilder.java: Updated h2020.docx DMP template and added export of DMP description. (cherry picked from commit 28c1c9b71dc2360629d6265436e786b9df5f5aa8) --- .../utilities/documents/word/WordBuilder.java | 17 ++++++++++++++--- .../src/main/resources/documents/h2020.docx | Bin 20460 -> 14632 bytes 2 files changed, 14 insertions(+), 3 deletions(-) diff --git a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java index a325194b9..9863ec9ff 100644 --- a/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java +++ b/dmp-backend/web/src/main/java/eu/eudat/logic/utilities/documents/word/WordBuilder.java @@ -941,10 +941,14 @@ public class WordBuilder { } else if(datasetEntity != null && text.contains("{ARGOS.DATASET.TITLE}")) { text = text.replace("{ARGOS.DATASET.TITLE}", datasetEntity.getLabel()); r.setText(text, 0); - } else if(datasetEntity != null && text.contains("{ARGOS.DATASET.DESCRIPTION}")) { + } else if((dmpEntity != null && text.contains("{ARGOS.DMP.DESCRIPTION}")) || (datasetEntity != null && text.contains("{ARGOS.DATASET.DESCRIPTION}"))) { descrParPos = parPos; descrPar = p; - text = text.replace("{ARGOS.DATASET.DESCRIPTION}", ""); + if(dmpEntity != null) { + text = text.replace("{ARGOS.DMP.DESCRIPTION}", ""); + } else { + text = text.replace("{ARGOS.DATASET.DESCRIPTION}", ""); + } r.setText(text, 0); } else if(text.equals("{ARGOS.DMP.RESEARCHERS}")) { String researchersNames = ""; @@ -974,7 +978,14 @@ public class WordBuilder { } parPos++; } - if(descrParPos != -1 && datasetEntity.getDescription() != null) { + if(descrParPos != -1 && dmpEntity!=null && dmpEntity.getDescription() != null) { + XmlCursor cursor = descrPar.getCTP().newCursor(); + cursor.toNextSibling(); + Document htmlDoc = Jsoup.parse(((String)dmpEntity.getDescription()).replaceAll("\n", "
")); + HtmlToWorldBuilder htmlToWorldBuilder = new HtmlToWorldBuilder(descrPar, 0, cursor); + NodeTraversor.traverse(htmlToWorldBuilder, htmlDoc); + } + if(descrParPos != -1 && datasetEntity != null && datasetEntity.getDescription() != null) { XmlCursor cursor = descrPar.getCTP().newCursor(); cursor.toNextSibling(); Document htmlDoc = Jsoup.parse(((String)datasetEntity.getDescription()).replaceAll("\n", "
")); diff --git a/dmp-backend/web/src/main/resources/documents/h2020.docx b/dmp-backend/web/src/main/resources/documents/h2020.docx index 9d5713b2629b18c679b773cdea3a0bd8222fc900..084eb42d82efbf4484185320c3f79d25a7e0960f 100644 GIT binary patch delta 8528 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