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 134e610ab7f9fc7be1922cb1bab9250eded1a97b Author: jcouteau <couteau@codelutin.com> Date: Thu Jan 30 16:01:36 2020 +0100 refs #10216 : Fix Atlantos acoustic export (still issue on echotype vocabulary) --- .../service/atlantos/xml/XmlAccousticExport.java | 32 ++++++++++++---------- 1 file changed, 17 insertions(+), 15 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 8e2d64b0..ccb74c0e 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 @@ -97,7 +97,10 @@ public class XmlAccousticExport implements EchoBaseService { for (DataProcessing dataProcessing : dataProcessings) { // EXPORT DATA PROCESSING - exportDataProcessing(dataProcessing, xmlHead); + exportDataProcessing(dataProcessing, + dataAcquisition.getTransceiverAcquisitionPower(), + dataAcquisition.getTransceiverAcquisitionPulseLength(), + xmlHead); // EXPORT CRUISE if (!exportCruiseDone) { @@ -262,7 +265,7 @@ public class XmlAccousticExport implements EchoBaseService { xml.close("DataAcquisition"); } - public void exportDataProcessing(DataProcessing dataProcessing, XmlWriter xml) throws IOException { + public void exportDataProcessing(DataProcessing dataProcessing, float transceiverPower, float transmitPulseLength, XmlWriter xml) throws IOException { xml.open("DataProcessing", "ID", XmlAccousticExport.getFormatedTopiaId(dataProcessing)); @@ -278,6 +281,8 @@ public class XmlAccousticExport implements EchoBaseService { dataProcessing.getBandwidth()); xml.create("Frequency", dataProcessing.getFrequency()); + xml.create("TransceiverPower", transceiverPower); + xml.create("TransmitPulseLength", transmitPulseLength); xml.create("OnAxisGain", dataProcessing.getTransceiverProcessingGain()); xml.create("OnAxisGainUnit", "IDREF", @@ -444,20 +449,17 @@ public class XmlAccousticExport implements EchoBaseService { } public void exportData(Voyage voyage, Result result, XmlWriter xml) throws IOException { - if (!result.getResultValue().equals("NA")) { - xml.open("Data"); - xml.create("EchoType", - "IDREF", result.getCategory().getEchotype().getName()); - vocabulary.addCategory(result.getCategory()); - xml.create("Type", - "IDREF", vocabulary.getVocabularyCode("AC_AcousticDataType_C")); - xml.create("Unit", - "IDREF", vocabulary.getVocabularyCode("AC_DataUnit_m2nmi-2")); + xml.open("Data"); + xml.create("EchoType", + "IDREF", result.getCategory().getEchotype().getName()); + vocabulary.addCategory(result.getCategory()); + xml.create("Type", + "IDREF", vocabulary.getVocabularyCode("AC_AcousticDataType_C")); + xml.create("Unit", + "IDREF", vocabulary.getVocabularyCode("AC_DataUnit_m2nmi-2")); - xml.create("Value", - result.getResultValue()); + xml.create("Value", result.getResultValue().equals("NA")?0:result.getResultValue()); - xml.close("Data"); - } + xml.close("Data"); } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.