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 5e10a8e3176d7c3eb3c56f73410e241eedbfc413 Author: Jean Couteau <jean.couteau@gmail.com> Date: Wed Feb 7 17:43:32 2018 +0100 refs #9685 : fixes acoustic file --- .../services/service/atlantos/xml/VocabularyExport.java | 2 ++ .../services/service/atlantos/xml/XmlAccousticExport.java | 13 ++++++++++--- 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java index 72a23fea..363da332 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/VocabularyExport.java @@ -64,6 +64,8 @@ public class VocabularyExport implements EchoBaseService { // For Accoustic this.vocabularyTags.put("AC_LogOrigin", "Origin"); + this.vocabularyTags.put("AC_LogValidity", "LogValidity"); + this.vocabularyTags.put("AC_AcquisitionMethod_SS", "AcquisitionMethod"); this.vocabularyTags.put("AC_SaCategory", "SaCategory"); this.vocabularyTags.put("AC_AcousticDataType", "Type"); this.vocabularyTags.put("AC_DataUnit", "Unit"); 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 fcda8421..bef99d5c 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 @@ -243,6 +243,7 @@ public class XmlAccousticExport implements EchoBaseService { EchoBaseCsvUtil.ISO8611_DATE_FORMATTER.format(calibration.getDate())); xml.create("AcquisitionMethod", "IDREF", vocabulary.getVocabularyCode(calibration.getAquisitionMethod(), "AC_AcquisitionMethod_SS")); + vocabulary.getVocabularyCode("AC_AcquisitionMethod_SS"); xml.create("ProcessingMethod", "IDREF", vocabulary.getVocabularyCode("Method_" + calibration.getProcessingMethod(), "AC_ProcessingMethod_ER60")); xml.create("AccuracyEstimate", @@ -462,9 +463,15 @@ public class XmlAccousticExport implements EchoBaseService { "IDREF", vocabulary.getVocabularyCode("AC_AcousticDataType_C")); xml.create("Unit", "IDREF", vocabulary.getVocabularyCode("AC_DataUnit_m2nmi-2")); - xml.create("Value", - result.getResultValue()); - + + if (result.getResultValue().equals("NA")){ + xml.create("Value", + "0"); + } else { + xml.create("Value", + result.getResultValue()); + } + xml.close("Data"); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.