branch develop updated (42e3fd05 -> ed19cfcc)
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 42e3fd05 fixes #9717 : Le champ "LengthClass" des lignes "biology" ne devrait pas être égal à zéro dans l'export biotic CIEM new 287734f5 Improve Biotic ICES export new ed19cfcc fixes #9737 : Le champ "Frequency" n'est pas bien renseigné dans le chapitre "Instrument" de l'export acoustic The 2 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 ed19cfccb75ac50cab30a38dbd2ec436a529a0dc Author: Jean Couteau <jean.couteau@gmail.com> Date: Wed Feb 28 15:49:43 2018 +0100 fixes #9737 : Le champ "Frequency" n'est pas bien renseigné dans le chapitre "Instrument" de l'export acoustic commit 287734f5e72949344218baf52312f254bfd125c7 Author: Jean Couteau <jean.couteau@gmail.com> Date: Tue Feb 27 14:57:56 2018 +0100 Improve Biotic ICES export Summary of changes: .../service/atlantos/xml/XmlAccousticExport.java | 2 +- .../service/atlantos/xml/XmlBioticExport.java | 34 +++++++--------------- 2 files changed, 11 insertions(+), 25 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 287734f5e72949344218baf52312f254bfd125c7 Author: Jean Couteau <jean.couteau@gmail.com> Date: Tue Feb 27 14:57:56 2018 +0100 Improve Biotic ICES export --- .../service/atlantos/xml/XmlBioticExport.java | 34 +++++++--------------- 1 file changed, 10 insertions(+), 24 deletions(-) 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 1edb9fda..70f81640 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 @@ -141,7 +141,7 @@ public class XmlBioticExport implements EchoBaseService { for (Sample sample : subSamples) { SpeciesCategory category = sample.getSpeciesCategory(); //export only ICES allowed species - if (category.getSpecies().getIcesExport() != null && category.getSpecies().getIcesExport()) { + //if (category.getSpecies().getIcesExport() != null && category.getSpecies().getIcesExport()) { String code = category.getSpecies().getBaracoudaCode(); String size = code + "#" + category.getSizeCategoryLabel(); @@ -161,7 +161,7 @@ public class XmlBioticExport implements EchoBaseService { } xmlCruise.close("Catch"); - } + //} } xmlCruise.close("Haul"); @@ -384,32 +384,18 @@ public class XmlBioticExport implements EchoBaseService { } - xml.create("LengthCode", - "IDREF", vocabulary.getVocabularyCode("AC_LengthCode_mm")); if (lengthClassValue.intValue()!= 0) { + xml.create("LengthCode", + "IDREF", vocabulary.getVocabularyCode("AC_LengthCode_mm")); xml.create("LengthClass", lengthClassValue.intValue()); + xml.create("LengthType", + "IDREF", vocabulary.getVocabularyCode("AC_LengthMeasurementType_1")); + xml.create("NumberAtLength", + subsample.getNumberSampled()); + xml.create("WeightAtLength", + weightAtLength != null ? weightAtLength : 0); } - xml.create("LengthType", - "IDREF", vocabulary.getVocabularyCode("AC_LengthMeasurementType_1")); - xml.create("NumberAtLength", - numberAtLength != null ? numberAtLength : 0); -// if (lengthClassValue.intValue()== 0) { -// xml.create("NumberAtLength", -// subsample.getNumberSampled()); -// } else { -// xml.create("NumberAtLength", -// numberAtLength != null ? numberAtLength : 0); -// } - xml.create("WeightAtLength", - weightAtLength != null ? weightAtLength : 0); -// if (numberAtLength != null){ -// xml.create("NumberAtLength", numberAtLength); -// } -// -// if (weightAtLength != null) { -// xml.create("WeightAtLength", weightAtLength); -// } } public void exportBiology(Sample individualSample, XmlWriter xml) throws IOException { -- 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 ed19cfccb75ac50cab30a38dbd2ec436a529a0dc Author: Jean Couteau <jean.couteau@gmail.com> Date: Wed Feb 28 15:49:43 2018 +0100 fixes #9737 : Le champ "Frequency" n'est pas bien renseigné dans le chapitre "Instrument" de l'export acoustic --- .../echobase/services/service/atlantos/xml/XmlAccousticExport.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 4d8c240b..dd8204c0 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 @@ -194,7 +194,7 @@ public class XmlAccousticExport implements EchoBaseService { "ID", XmlAccousticExport.getFormatedTopiaId(instrument)); xml.create("Frequency", - instrument.getTransducerFrequency()); + Integer.parseInt(instrument.getFrequency())/1000); xml.create("TransducerLocation", "IDREF", vocabulary.getVocabularyCode(instrument.getTransducerLocation(), "AC_TransducerLocation_AA")); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm