This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git commit b7ec578bdb4a19edfd7ebd35471b9212ba4d95e9 Author: jruchaud <ruchaud@codelutin.com> Date: Fri Feb 2 16:52:08 2018 +0100 Add voyage in SaCategory key --- .../services/service/atlantos/xml/XmlAccousticExport.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java index 93ca5b7d..69620930 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlAccousticExport.java @@ -146,7 +146,7 @@ public class XmlAccousticExport implements EchoBaseService { // EXPORT SAMPLE if (resultForD4 != null && exportSample(voyage, cell, resultForD4, xmlCruise)) { // EXPORT DATA - exportData(resultForD4, xmlCruise); + exportData(voyage, resultForD4, xmlCruise); xmlCruise.close("Sample"); } @@ -156,7 +156,7 @@ public class XmlAccousticExport implements EchoBaseService { for (Result result : resultsWithoutD4) { // EXPORT DATA - exportData(result, xmlCruise); + exportData(voyage, result, xmlCruise); } xmlCruise.close("Sample"); @@ -446,11 +446,11 @@ public class XmlAccousticExport implements EchoBaseService { return true; } - public void exportData(Result result, XmlWriter xml) throws IOException { + public void exportData(Voyage voyage, Result result, XmlWriter xml) throws IOException { xml.open("Data"); xml.create("SaCategory", - "IDREF", vocabulary.getVocabularyCode(result.getCategory().getEchotype().getName(), "AC_SaCategory_D4")); + "IDREF", vocabulary.getVocabularyCode(voyage.getCode() + ":" + result.getCategory().getEchotype().getName(), "AC_SaCategory_D4")); xml.create("Type", "IDREF", vocabulary.getVocabularyCode("AC_AcousticDataType_C")); xml.create("Unit", -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.