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>.