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 8e5d0350dbf33d590417f8a9e9b49a84eaa9f3c7 Author: Julien Ruchaud <julien.ruchaud@debux.org> Date: Thu Nov 10 17:01:25 2016 +0100 #8173 Corrections --- .../services/service/atlantos/xml/XmlAccousticExport.java | 10 +++++----- .../services/service/atlantos/xml/XmlBioticExport.java | 2 +- 2 files changed, 6 insertions(+), 6 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 2df86b2..1b89272 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 @@ -114,7 +114,7 @@ public class XmlAccousticExport implements EchoBaseService { return o1.getName().compareTo(o2.getName()); } }); - + int position = 0; for (Cell cell : orderingCells) { @@ -140,7 +140,7 @@ public class XmlAccousticExport implements EchoBaseService { } } } - + if (exportCruiseDone) { xmlCruise.close("Cruise"); } @@ -285,9 +285,9 @@ public class XmlAccousticExport implements EchoBaseService { xml.create("Platform", "IDREF", vocabulary.getVocabularyCode(transect.getVessel().getCode(), "SHIPC_35HT")); xml.create("StartDate", - EchoBaseCsvUtil.ISO8611_DATE_FORMATTER.format(voyage.getStartDate())); + EchoBaseCsvUtil.ISO8611_DATETIME_FORMATTER.format(voyage.getStartDate())); xml.create("EndDate", - EchoBaseCsvUtil.ISO8611_DATE_FORMATTER.format(voyage.getEndDate())); + EchoBaseCsvUtil.ISO8611_DATETIME_FORMATTER.format(voyage.getEndDate())); xml.create("Organisation", "IDREF", vocabulary.getVocabularyCode(voyage.getMission().getInstitution(), "EDMO_541")); xml.create("LocalID", @@ -350,7 +350,7 @@ public class XmlAccousticExport implements EchoBaseService { String prefix = "start"; String depthRefSurfaceMeta = "DepthRefSurfaceStart"; - if (!dataValues.containsKey("DepthRefSurfaceStart")) { + if (!dataValues.containsKey("LatitudeStart")) { prefix = "end"; depthRefSurfaceMeta = "DepthRefSurfaceEnd"; } 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 0d910f0..ec8c76c 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 @@ -255,7 +255,7 @@ public class XmlBioticExport implements EchoBaseService { xml.create("StationName", operation.getId()); xml.create("StartTime", - EchoBaseCsvUtil.ISO8611_DATE_FORMATTER.format(operation.getGearShootingStartTime())); + EchoBaseCsvUtil.ISO8611_DATETIME_FORMATTER.format(operation.getGearShootingStartTime())); xml.create("Duration", (int)((operation.getGearShootingEndTime().getTime() - operation.getGearShootingStartTime().getTime()) / (1000 * 60))); xml.create("Validity", -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.