branch develop updated (b6e1bcbf -> 4aae35e7)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See https://gitlab.nuiton.org/codelutin/echobase.git from b6e1bcbf fixes #9686 new 4aae35e7 refs #9685 : Acoustic ok, Biotic seems ok (only data pb on my tests) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 4aae35e77b6c6a7d5407423ee44c2cbeb49c01ff Author: Jean Couteau <jean.couteau@gmail.com> Date: Wed Feb 7 16:04:01 2018 +0100 refs #9685 : Acoustic ok, Biotic seems ok (only data pb on my tests) Summary of changes: .../services/service/atlantos/xml/XmlAccousticExport.java | 15 +++++++++++---- .../services/service/atlantos/xml/XmlBioticExport.java | 6 +++--- 2 files changed, 14 insertions(+), 7 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
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 4aae35e77b6c6a7d5407423ee44c2cbeb49c01ff Author: Jean Couteau <jean.couteau@gmail.com> Date: Wed Feb 7 16:04:01 2018 +0100 refs #9685 : Acoustic ok, Biotic seems ok (only data pb on my tests) --- .../services/service/atlantos/xml/XmlAccousticExport.java | 15 +++++++++++---- .../services/service/atlantos/xml/XmlBioticExport.java | 6 +++--- 2 files changed, 14 insertions(+), 7 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 69620930..fcda8421 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 @@ -363,6 +363,9 @@ public class XmlAccousticExport implements EchoBaseService { longitude != null ? longitude.getDataValue() : 0); xml.create("Origin", "IDREF", vocabulary.getVocabularyCode("AC_LogOrigin_" + prefix)); + xml.create("Validity", + "IDREF", vocabulary.getVocabularyCode("AC_LogValidity_V")); + //xml.create("BottomDepth"); } public boolean exportSample(Voyage voyage, Cell cell, Result result, XmlWriter xml) throws IOException { @@ -429,14 +432,18 @@ public class XmlAccousticExport implements EchoBaseService { "IDREF", vocabulary.getVocabularyCode("AC_PingAxisIntervalType_distance")); xml.create("PingAxisIntervalUnit", "IDREF", vocabulary.getVocabularyCode("AC_PingAxisIntervalUnit_nmi")); - xml.create("SvThreshhold", + xml.create("SvThreshold", cell.getDataProcessing().geteIThresholdLow()); xml.create("Instrument", "IDREF", XmlAccousticExport.getFormatedTopiaId(cell.getDataProcessing().getDataAcquisition().getAcousticInstrument())); - xml.create("Calibration", - "IDREF", calibrationFound != null ? XmlAccousticExport.getFormatedTopiaId(calibrationFound) : ""); - xml.create("DataAcquisition", + if (calibrationFound != null){ + xml.create("Calibration", + "IDREF", XmlAccousticExport.getFormatedTopiaId(calibrationFound)); + } else { + xml.create("Calibration"); + } + xml.create("DataAcquisition", "IDREF", XmlAccousticExport.getFormatedTopiaId(cell.getDataProcessing().getDataAcquisition())); xml.create("DataProcessing", "IDREF", XmlAccousticExport.getFormatedTopiaId(cell.getDataProcessing())); diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java index f1db74b8..abf44ca5 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/atlantos/xml/XmlBioticExport.java @@ -353,9 +353,9 @@ public class XmlBioticExport implements EchoBaseService { xml.create("SpeciesCategoryWeight", weight != null ? weight.intValue() : 0); - xml.create("SpeciesCategory", - "IDREF", vocabulary.getVocabularyCode(category.getSizeCategoryLabel(), "AC_CatchCategory_1")); -// xml.create("SpeciesSex"); + /*xml.create("SpeciesCategory", + "IDREF", vocabulary.getVocabularyCode(category.getSizeCategoryLabel(), "AC_CatchCategory_1")); */ + xml.create("SpeciesSex"); xml.create("SubsampledNumber", subsample.getNumberSampled()); xml.create("SubsamplingFactor", -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm