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 9d328e220289c40f0b5e48cf9fb7feb2135d317f Author: Jean Couteau <jean.couteau@gmail.com> Date: Thu Mar 1 15:35:23 2018 +0100 fixes #9740 : "CalibrationID" non renseigné dans le chapitre Samples" de l'export acoustic --- .../services/service/atlantos/xml/XmlAccousticExport.java | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 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 dd8204c0..afeb6213 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 @@ -87,8 +87,14 @@ public class XmlAccousticExport implements EchoBaseService { // EXPORT CALIBRATION Collection<Calibration> calibrations = acousticInstrument.getCalibration(); + Date startDate = voyage.getStartDate(); + Date endDate = voyage.getEndDate(); for (Calibration calibration : calibrations) { - this.exportCalibration(calibration, xmlHead); + Date date = calibration.getDate(); + if (date != null && date.after(startDate) && date.before(endDate)) { + this.exportCalibration(calibration, xmlHead); + break; + } } // EXPORT DATA ACQUISITION @@ -374,10 +380,11 @@ public class XmlAccousticExport implements EchoBaseService { // Utiliser la date de début du voyage Collection<Calibration> calibrations = cell.getDataProcessing().getDataAcquisition().getAcousticInstrument().getCalibration(); Date startDate = voyage.getStartDate(); + Date endDate = voyage.getEndDate(); Calibration calibrationFound = null; for (Calibration calibration : calibrations) { Date date = calibration.getDate(); - if (date != null && date.equals(startDate)) { + if (date != null && date.after(startDate) && date.before(endDate)) { calibrationFound = calibration; break; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.