branch develop updated (d911de9 -> b01168d)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository echobase. See http://git.codelutin.com/echobase.git from d911de9 fixes #6279: Les liens sur la documentation ne sont pas corrects new e611def fix typo new 238598e remove unused jsp new b01168d refs #6054 add more logs for acoustic import The 3 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 b01168def213a350ed2e98c7e8d7901d68f0d2a7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 15 11:15:05 2014 +0100 refs #6054 add more logs for acoustic import commit 238598e02bae721ecc13135869c1a9383d7a0c51 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 15 11:14:31 2014 +0100 remove unused jsp commit e611def0c26a5803ed73085c68bf6e08aa982906 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 15 11:14:14 2014 +0100 fix typo Summary of changes: .../service/importdata/AcousticImportService.java | 35 ++++++++++++++++--- .../echobase/ui/actions/EchoBaseActionSupport.java | 6 ++-- .../main/webapp/WEB-INF/jsp/spatial/showMap.jsp | 39 ---------------------- 3 files changed, 33 insertions(+), 47 deletions(-) delete mode 100644 echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp -- 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 http://git.codelutin.com/echobase.git commit e611def0c26a5803ed73085c68bf6e08aa982906 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 15 11:14:14 2014 +0100 fix typo --- .../java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java index 2cce893..d8f56a3 100644 --- a/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java +++ b/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/EchoBaseActionSupport.java @@ -111,17 +111,17 @@ public class EchoBaseActionSupport extends BaseAction { private transient EchoBaseServiceContext serviceContext; public EchoBaseApplicationContext getEchoBaseApplicationContext() { - Preconditions.checkNotNull("No applicationContext is your action " + this); + Preconditions.checkNotNull("No applicationContext in your action " + this); return applicationContext; } public EchoBaseSession getEchoBaseSession() { - Preconditions.checkNotNull("No echoBaseSession is your action " + this); + Preconditions.checkNotNull("No echoBaseSession in your action " + this); return echoBaseSession; } public EchoBaseServiceContext getServiceContext() { - Preconditions.checkNotNull("No serviceContext is your action " + this); + Preconditions.checkNotNull("No serviceContext in your action " + this); return serviceContext; } -- 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 http://git.codelutin.com/echobase.git commit 238598e02bae721ecc13135869c1a9383d7a0c51 Author: Tony CHEMIT <chemit@codelutin.com> Date: Mon Dec 15 11:14:31 2014 +0100 remove unused jsp --- .../main/webapp/WEB-INF/jsp/spatial/showMap.jsp | 39 ---------------------- 1 file changed, 39 deletions(-) diff --git a/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp b/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp deleted file mode 100644 index 8dc15a0..0000000 --- a/echobase-ui/src/main/webapp/WEB-INF/jsp/spatial/showMap.jsp +++ /dev/null @@ -1,39 +0,0 @@ -<%-- - #%L - EchoBase :: UI - %% - Copyright (C) 2011 - 2013 Ifremer, Codelutin - %% - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see <http://www.gnu.org/licenses/>. - #L% - --%> -<%@page contentType="text/html" pageEncoding="UTF-8" %> -<%@ taglib prefix="s" uri="/struts-tags" %> -<%@ taglib prefix="sj" uri="/struts-jquery-tags" %> - -<sj:head jqueryui="true" jquerytheme="echobase-theme" debug="true" compressed="false" /> - -<script type="text/javascript" - src="<s:url value='/js/leaflet-src.js' />"></script> - -<script type="text/javascript"> - - jQuery(document).ready(function () { - - }); -</script> -<div id="map"> -Loading... -</div> - -- 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 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>.
participants (1)
-
codelutin.com scm