This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository echobase. See http://git.codelutin.com/echobase.git commit b01168def213a350ed2e98c7e8d7901d68f0d2a7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 15 11:15:05 2014 +0100 refs #6054 add more logs for acoustic import --- .../service/importdata/AcousticImportService.java | 35 ++++++++++++++++++---- 1 file changed, 30 insertions(+), 5 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java index b98526c..4a7e008 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AcousticImportService.java @@ -126,6 +126,8 @@ public class AcousticImportService extends AbstractImportDataService<AcousticImp return result; } + private String lastEsduId; + private EchoBaseCsvFileImportResult importMoviesFile(AcousticImportConfiguration configuration, Voyage voyage, Vessel vessel, @@ -308,8 +310,32 @@ public class AcousticImportService extends AbstractImportDataService<AcousticImp String esduCellId = cellDateFormat.format(endDate); + String previousLastEsduId = lastEsduId; + + if (lastEsduId == null || !lastEsduId.equals(esduCellId)) { + + lastEsduId = esduCellId; + // find a new esdu cell id + if (log.isDebugEnabled()) { + log.debug("row: " + rowNumber + " - detects new esduCellId:" + lastEsduId); + } + } boolean isEsduCell = cellType == 4; + if (isEsduCell) { + + if (!esduCellId.equals(previousLastEsduId)) { + + // This should not happen ? + if (log.isWarnEnabled()) { + log.warn("row: "+rowNumber+" A previous esduCellId was detected ("+previousLastEsduId+"); but the esdu id was never found."); + } + } + if (log.isDebugEnabled()) { + log.debug("row: " + rowNumber + " - found esdu cell:" + lastEsduId); + } + } + if (!row.isCellToAdd()) { // dead cell not to be imported @@ -325,8 +351,8 @@ public class AcousticImportService extends AbstractImportDataService<AcousticImp } else { // just a debug log - if (log.isDebugEnabled()) { - log.debug("Will not import cell of row " + id); + if (log.isTraceEnabled()) { + log.trace("Will not import cell of row " + id); } } @@ -390,9 +416,8 @@ public class AcousticImportService extends AbstractImportDataService<AcousticImp String elementaryCellId = cellNum + (surface ? "S" : "B"); - if (log.isDebugEnabled()) { - log.debug("[row " + rowNumber + "] elementary cell (" + - elementaryCellId + ")"); + if (log.isTraceEnabled()) { + log.trace("[row " + rowNumber + "] elementary cell (" + elementaryCellId + ")"); } // create the elementary cell -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.