March 2013 - Echobase-commits - mailman.cloud.codelutin.com

r801 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy
by tchemit＠users.forge.codelutin.com 19 Mar '13

19 Mar '13

Author: tchemit Date: 2013-03-19 09:49:36 +0100 (Tue, 19 Mar 2013) New Revision: 801 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/801 Log: fixes #2154: Probl?\195?\168me ?\195?\160 la suppression d'import de r?\195?\169sultats de voyage Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/ResultVoyageRemoveDataStrategy.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2013-03-19 08:02:37 UTC (rev 800) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2013-03-19 08:49:36 UTC (rev 801) @@ -23,6 +23,7 @@ * #L% */ +import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; @@ -45,7 +46,6 @@ import fr.ifremer.echobase.services.EchoBaseServiceContext; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.ProgressModel; -import org.apache.commons.collections.CollectionUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; @@ -181,70 +181,19 @@ } } - protected void removeLengthWeightKey(Voyage entity, - LengthWeightKey lengthWeightKey) throws TopiaException { + protected void removeVoyagePostCell(Voyage entity) throws TopiaException { - lengthWeightKeyDAO.delete(lengthWeightKey); + if (!entity.isPostCellEmpty()) { + for (Cell cell : Sets.newHashSet(entity.getPostCell())) { - if (entity != null) { + // remove it from the voyage + entity.removePostCell(cell); - // remove it from the voyage - entity.removeLengthWeightKey(lengthWeightKey); - } - incrementOp("Remove lengthWeightKey " + lengthWeightKey.getTopiaId()); - } + // delete postcell + cellDAO.delete(cell); - protected void removeLengthAgeKey(Voyage entity, - LengthAgeKey lengthAgeKey) throws TopiaException { - - lengthAgeKeyDAO.delete(lengthAgeKey); - - if (entity != null) { - - // remove it from the voyage - entity.removeLengthAgeKey(lengthAgeKey); - } - incrementOp("Remove lengthAgeKey " + lengthAgeKey.getTopiaId()); - } - - protected void removeEchotype(Voyage entity, - Echotype echotype) throws TopiaException { - - // delete all categories using this echotype - List<Category> allByEchotype = categoryDAO.findAllByEchotype(echotype); - categoryDAO.deleteAll(allByEchotype); - - if (entity != null) { - - // remove it from the voyage - entity.removeEchotype(echotype); - } - - // delete echotype - echotypeDAO.delete(echotype); - - incrementOp("Remove echotype " + echotype.getTopiaId()); - } - - protected void removePostCell(Voyage entity, - Cell cell) throws TopiaException { - if (entity != null) { - - // remove it from the voyage - entity.removePostCell(cell); - } - - // delete postcell - cellDAO.delete(cell); - - incrementOp("Remove postCell " + cell.getTopiaId()); - } - - protected void removeVoyagePostCell(Voyage entity) throws TopiaException { - - if (CollectionUtils.isNotEmpty(entity.getPostCell())) { - for (Cell postCell : entity.getPostCell()) { - removePostCell(null, postCell); + // increments operation + incrementOp("Remove postCell " + cell.getTopiaId()); } // clean this data Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/ResultVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/ResultVoyageRemoveDataStrategy.java 2013-03-19 08:02:37 UTC (rev 800) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/ResultVoyageRemoveDataStrategy.java 2013-03-19 08:49:36 UTC (rev 801) @@ -26,6 +26,7 @@ import com.google.common.collect.Sets; import fr.ifremer.echobase.entities.ImportLog; import fr.ifremer.echobase.entities.ImportType; +import fr.ifremer.echobase.entities.data.Category; import fr.ifremer.echobase.entities.data.Echotype; import fr.ifremer.echobase.entities.data.LengthAgeKey; import fr.ifremer.echobase.entities.data.LengthWeightKey; @@ -34,6 +35,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; +import java.util.List; import java.util.Set; /** @@ -78,32 +80,59 @@ if (id.startsWith(Echotype.class.getName())) { // remove echotype - Echotype entity = echotypeDAO.findByTopiaId(id); + Echotype echotype = echotypeDAO.findByTopiaId(id); - removeEchotype(voyage, entity); + // delete all categories using this echotype + List<Category> allByEchotype = categoryDAO.findAllByEchotype(echotype); + categoryDAO.deleteAll(allByEchotype); + if (voyage != null) { + + // remove it from the voyage + voyage.removeEchotype(echotype); + } + + // delete echotype + echotypeDAO.delete(echotype); + + incrementOp("Remove echotype " + echotype.getTopiaId()); + if (log.isDebugEnabled()) { - log.debug(entity.getTopiaId() + " was removed"); + log.debug(echotype.getTopiaId() + " was removed"); } } else if (id.startsWith(LengthAgeKey.class.getName())) { // remove lengthAgeKey - LengthAgeKey entity = lengthAgeKeyDAO.findByTopiaId(id); + LengthAgeKey lengthAgeKey = lengthAgeKeyDAO.findByTopiaId(id); - removeLengthAgeKey(voyage, entity); + lengthAgeKeyDAO.delete(lengthAgeKey); + if (voyage != null) { + + // remove it from the voyage + voyage.removeLengthAgeKey(lengthAgeKey); + } + incrementOp("Remove lengthAgeKey " + lengthAgeKey.getTopiaId()); + if (log.isDebugEnabled()) { - log.debug(entity.getTopiaId() + " was removed"); + log.debug(lengthAgeKey.getTopiaId() + " was removed"); } } else if (id.startsWith(LengthWeightKey.class.getName())) { - // remove lengthAgeKey - LengthWeightKey entity = lengthWeightKeyDAO.findByTopiaId(id); + // remove lengthWeightKey + LengthWeightKey lengthWeightKey = lengthWeightKeyDAO.findByTopiaId(id); - removeLengthWeightKey(voyage, entity); + lengthWeightKeyDAO.delete(lengthWeightKey); + if (voyage != null) { + + // remove it from the voyage + voyage.removeLengthWeightKey(lengthWeightKey); + } + incrementOp("Remove lengthWeightKey " + lengthWeightKey.getTopiaId()); + if (log.isDebugEnabled()) { - log.debug(entity.getTopiaId() + " was removed"); + log.debug(lengthWeightKey.getTopiaId() + " was removed"); } } else { canNotDealWithId(id);

1 0

r800 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata
by tchemit＠users.forge.codelutin.com 19 Mar '13

19 Mar '13

Author: tchemit Date: 2013-03-19 09:02:37 +0100 (Tue, 19 Mar 2013) New Revision: 800 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/800 Log: fixes #2089: Pb de mise ?\195?\160 jour des champs du tableau de bord fixes #2070: Les r?\195?\169sultats de type "carte" ne s'affichent pas dans le tableau de bord Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2013-03-19 08:01:36 UTC (rev 799) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2013-03-19 08:02:37 UTC (rev 800) @@ -112,7 +112,7 @@ s0 = TIME_LOG.log(s0, "importDone"); // add result in log book and compute resume to show in result -// String result = computeResultAndLogBookEntry(configuration, user); + String result = computeResultAndLogBookEntry(configuration, user); // do commit commitTransaction("Could not execute import " + @@ -120,8 +120,7 @@ TIME_LOG.log(s0, "importCommited"); -// return result; - return ""; + return result; } catch (EchoBaseTechnicalException e) { throw new ImportException(e.getMessage(), e); } @@ -288,8 +287,6 @@ return message; } - static long s0 =TimeLog.getTime(); - protected final void doFlushTransaction(int rowNumber, InputFile inputFile, M configuration) { @@ -297,13 +294,7 @@ if (rowNumber % 1000 == 0) { // flush each 1000 imported rows String message = getImportMessage(configuration, inputFile); -// long s0 = TimeLog.getTime(); -// flushTransaction("Could not flush transaction " + message); - s0 = TIME_LOG.log(s0, message); - commitTransaction("Could committransaction " + message); - if (log.isInfoEnabled()) { - log.info("Progression, row done: " + rowNumber); - } + flushTransaction("Could not flush transaction " + message); } }

1 0

r799 - trunk
by tchemit＠users.forge.codelutin.com 19 Mar '13

19 Mar '13

Author: tchemit Date: 2013-03-19 09:01:36 +0100 (Tue, 19 Mar 2013) New Revision: 799 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/799 Log: fixes #2152: Updates mavenpom to 3.4.8 Modified: trunk/pom.xml Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2013-03-19 07:28:10 UTC (rev 798) +++ trunk/pom.xml 2013-03-19 08:01:36 UTC (rev 799) @@ -6,7 +6,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom4redmine</artifactId> - <version>3.4.7</version> + <version>3.4.8</version> </parent> <groupId>fr.ifremer</groupId>

1 0

r798 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions/user webapp/WEB-INF/jsp/user
by tchemit＠users.forge.codelutin.com 19 Mar '13

19 Mar '13

Author: tchemit Date: 2013-03-19 08:28:10 +0100 (Tue, 19 Mar 2013) New Revision: 798 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/798 Log: fixes 2021: Pb affichage liste utilisateurs Echobase Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java 2013-03-19 07:04:25 UTC (rev 797) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/GetUsers.java 2013-03-19 07:28:10 UTC (rev 798) @@ -42,10 +42,10 @@ private static final long serialVersionUID = 1L; - protected transient Map<String, Object>[] users; + protected transient Map<String, Object>[] datas; - public Map<String, Object>[] getUsers() { - return users; + public Map<String, Object>[] getDatas() { + return datas; } @Override @@ -54,7 +54,7 @@ List<EchoBaseUser> allUsers = getService(UserService.class).getUsers(pager); - users = new Map[allUsers.size()]; + datas = new Map[allUsers.size()]; Binder<EchoBaseUser, EchoBaseUser> binder = BinderFactory.newBinder(EchoBaseUser.class); @@ -62,7 +62,7 @@ for (EchoBaseUser user : allUsers) { Map<String, Object> data = binder.obtainProperties(user); data.put("id", user.getTopiaId()); - users[index++] = data; + datas[index++] = data; } return SUCCESS; Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2013-03-19 07:04:25 UTC (rev 797) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/user/userList.jsp 2013-03-19 07:28:10 UTC (rev 798) @@ -48,7 +48,7 @@ }); </script> -<sjg:grid id="users" dataType="json" href="%{loadUrl}" gridModel="users" +<sjg:grid id="users" dataType="json" href="%{loadUrl}" gridModel="datas" pager="true" pagerButtons="true" pagerInput="true" navigator="true" rownumbers="false" autowidth="true" onSelectRowTopics='users-rowSelect'

1 0

r797 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions/workingDb resources/template/css_xhtml webapp/WEB-INF/jsp/workingDb
by tchemit＠users.forge.codelutin.com 19 Mar '13

19 Mar '13

Author: tchemit Date: 2013-03-19 08:04:25 +0100 (Tue, 19 Mar 2013) New Revision: 797 Url: http://forge.codelutin.com/projects/echobase/repository/revisions/797 Log: fixes #2098: Pb formattage Informations de connexion ?\195?\160 la base de donn?\195?\169es Added: trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java 2013-01-15 17:20:37 UTC (rev 796) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/workingDb/Information.java 2013-03-19 07:04:25 UTC (rev 797) @@ -57,6 +57,12 @@ dbConfiguration = getEchoBaseSession().getWorkingDbConfiguration(); + dbConfiguration = JdbcConfiguration.newConfig( + dbConfiguration.getDriverType(), + dbConfiguration.getUrl().replaceAll("\\\\", "/"), + dbConfiguration.getLogin(), + dbConfiguration.getPassword()); + pilotVersion = dbConfiguration.getDriverType().getPilotVersion(configuration); Added: trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl =================================================================== --- trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl (rev 0) +++ trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl 2013-03-19 07:04:25 UTC (rev 797) @@ -0,0 +1,45 @@ +<#-- + #%L + EchoBase :: UI + $Id$ + $HeadURL$ + %% + Copyright (C) 2011 - 2013 Ifremer, Codelutin, Tony Chemit + %% + 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% +--> +<#include "/${parameters.templateDir}/${parameters.theme}/controlheader.ftl" /> +<label<#rt/> +<#if parameters.id??> + id="${parameters.id?html}"<#rt/> +</#if> +<#if parameters.cssClass??> + class="${parameters.cssClass?html}"<#rt/> +</#if> +<#if parameters.cssStyle??> + style="${parameters.cssStyle?html}"<#rt/> +</#if> +<#if parameters.cssClass??> + class="${parameters.cssClass?html}"<#rt/> +</#if> +<#if parameters.for??> + for="${parameters.for?html}"<#rt/> +</#if> + ><#rt/> +<#if parameters.nameValue??> + <@s.property value="parameters.nameValue"/><#t/> +</#if> +</label> +<#include "/${parameters.templateDir}/css_xhtml/controlfooter.ftl" /> \ No newline at end of file Property changes on: trunk/echobase-ui/src/main/resources/template/css_xhtml/label_with_no_space.ftl ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision HeadURL Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp 2013-01-15 17:20:37 UTC (rev 796) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/jsp/workingDb/information.jsp 2013-03-19 07:04:25 UTC (rev 797) @@ -57,15 +57,15 @@ <br/> <fieldset> <legend><s:text name="echobase.legend.connectionToDb.detail"/></legend> - <s:label key="dbConfiguration.url" + <s:label key="dbConfiguration.url" template="label_with_no_space" label='%{getText("echobase.common.jdbcUrl")} (*)'/> - <s:label key="dbConfiguration.login" + <s:label key="dbConfiguration.login" template="label_with_no_space" label='%{getText("echobase.common.jdbcLogin")} (*)'/> - <s:label key="dbConfiguration.password" + <s:label key="dbConfiguration.password" template="label_with_no_space" label='%{getText("echobase.common.jdbcPassword")} (*)'/> - <s:label key="dbConfiguration.driverType.driverClass.name" + <s:label key="dbConfiguration.driverType.driverClass.name" template="label_with_no_space" label='%{getText("echobase.common.jdbcDriver")} (*)'/> - <s:label key="pilotVersion" + <s:label key="pilotVersion" template="label_with_no_space" label='%{getText("echobase.common.pilotVersion")}'/> <br/>

1 0