September 2012 - Echobase-commits - mailman.cloud.codelutin.com

r705 - trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io
by tchemit＠users.forge.codelutin.com 24 Sep '12

24 Sep '12

Author: tchemit Date: 2012-09-24 22:09:52 +0200 (Mon, 24 Sep 2012) New Revision: 705 Url: http://forge.codelutin.com/repositories/revision/echobase/705 Log: fix copy gz files Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2012-09-24 20:07:44 UTC (rev 704) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/io/EchoBaseIOUtil.java 2012-09-24 20:09:52 UTC (rev 705) @@ -24,6 +24,7 @@ import com.google.common.base.Charsets; import com.google.common.base.Preconditions; +import com.google.common.io.Files; import fr.ifremer.echobase.EchoBaseTechnicalException; import org.apache.commons.collections.CollectionUtils; import org.apache.commons.io.FileUtils; @@ -81,7 +82,25 @@ if (filesToMerge.size() == 1) { // simple copy - FileUtils.copyFile(filesToMerge.iterator().next(), destinationFile); + + File source = filesToMerge.iterator().next(); + if (source.getName().endsWith(".gz")) { + BufferedWriter writer = new BufferedWriter(Files.newWriter(destinationFile, Charsets.UTF_8)); + try { + BufferedReader reader = new BufferedReader(new InputStreamReader(new GZIPInputStream(new FileInputStream(source)), Charsets.UTF_8)); + try { + IOUtils.copy(reader, writer); + reader.close(); + } finally { + IOUtils.closeQuietly(reader); + } + writer.close(); + } finally { + IOUtils.closeQuietly(writer); + } + } else { + FileUtils.copyFile(source, destinationFile); + } } else { // must merge all files @@ -101,7 +120,7 @@ if (toMergeFile.getName().endsWith(".gz")) { reader = new BufferedReader(new InputStreamReader(new GZIPInputStream(new FileInputStream(toMergeFile)), Charsets.UTF_8)); } else { - reader = new BufferedReader(new InputStreamReader(new FileInputStream(toMergeFile), Charsets.UTF_8)); + reader = new BufferedReader(Files.newReader(toMergeFile, Charsets.UTF_8)); } try { // pass the first line (header)

1 0

r704 - in trunk/echobase-tools/src/test/echobase-2012-04-12/csv: association new
by tchemit＠users.forge.codelutin.com 24 Sep '12

24 Sep '12

Author: tchemit Date: 2012-09-24 22:07:44 +0200 (Mon, 24 Sep 2012) New Revision: 704 Url: http://forge.codelutin.com/repositories/revision/echobase/704 Log: refs #1436: Lissage des donn?\195?\169es anciennes (fix echotypes) Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Echotype_species.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv.gz trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Echotype_species.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/association/Voyage_echotype.csv.gz =================================================================== (Binary files differ) Modified: trunk/echobase-tools/src/test/echobase-2012-04-12/csv/new/Echotype.csv.gz =================================================================== (Binary files differ)

1 0

r703 - in trunk/echobase-ui/src/main: java/fr/ifremer/echobase/ui/actions resources/i18n webapp/WEB-INF/includes
by tchemit＠users.forge.codelutin.com 23 Sep '12

23 Sep '12

Author: tchemit Date: 2012-09-23 15:51:55 +0200 (Sun, 23 Sep 2012) New Revision: 703 Url: http://forge.codelutin.com/repositories/revision/echobase/703 Log: fix i18n Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java 2012-09-23 12:33:53 UTC (rev 702) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/Home.java 2012-09-23 13:51:55 UTC (rev 703) @@ -37,7 +37,7 @@ public String execute() throws Exception { if (!isWorkingDbSelected()) { - addFlashMessage(_("echobase.label.noWorkingDbSelected")); + addFlashMessage(_("echobase.info.no.workingDb.selected")); } return SUCCESS; } Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-23 12:33:53 UTC (rev 702) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-23 13:51:55 UTC (rev 703) @@ -277,7 +277,6 @@ echobase.label.exportFileName=Name of export file echobase.label.importFile=File to export echobase.label.login=Connection -echobase.label.noWorkingDbSelected=No working database selected echobase.label.numberOfCreatedEntities=No. of fields created echobase.label.numberOfUpdatedEntities=No. of fields updated echobase.label.query.description=Description Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-23 12:33:53 UTC (rev 702) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-23 13:51:55 UTC (rev 703) @@ -221,7 +221,7 @@ echobase.error.workingDbConfiguration.url.already.exists=Une configuration existe déjà avec cette url echobase.error.workingDbConfiguration.url.required=Url jdbc obligatoire echobase.header.request.result=Résultat de la requête SQL -echobase.importDb.dataResult=L'import de type données s'est déroulé abec succès en %s. +echobase.importDb.dataResult=L'import de type données s'est déroulé avec succès en %s. echobase.importDb.freeResult=L'import de type libre s'est déroulé avec succès en %s. echobase.importDb.referentialResult=L'import de type référentiel s'est déroulé avec succès en %s. echobase.info.click.to.select=Vous pouvez sélectionner la valeur en un simple click puis la copier (Ctrl-C) @@ -246,7 +246,7 @@ echobase.info.no.sqlQuery.selected=Aucune requête d'export SQL sélectionnée echobase.info.no.table.selected=Aucune table sélectionnée echobase.info.no.voyagee.found=Aucune campagne à exporter -echobase.info.no.workingDb.selected=Aucune base de travail de sélectionnée +echobase.info.no.workingDb.selected=Aucune base de travail sélectionnée echobase.info.no.workingDbConfiguration.saved=Aucune configuration de base de travail enregistrée echobase.info.no.workingDbConfiguration.selected=Sélectionner une configuration pour ensuite vous y connecter echobase.info.removeData.failed=La suppresion de l'import a échoué @@ -277,7 +277,6 @@ echobase.label.exportFileName=Nom du fichier d'export echobase.label.importFile=Fichier à importer echobase.label.login=Connexion -echobase.label.noWorkingDbSelected=Aucune base de travail sélectionnée echobase.label.numberOfCreatedEntities=Nombre de champs créés echobase.label.numberOfUpdatedEntities=Nombre de champs mis à jour echobase.label.query.description=Description Modified: trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp =================================================================== --- trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-23 12:33:53 UTC (rev 702) +++ trunk/echobase-ui/src/main/webapp/WEB-INF/includes/header.jsp 2012-09-23 13:51:55 UTC (rev 703) @@ -76,7 +76,7 @@ </s:a> </li> <li> - <s:text name="echobase.label.noWorkingDbSelected"/> + <s:text name="echobase.info.no.workingDb.selected"/> </li> </s:else> </ul>

1 0

r702 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors echobase-ui/src/main/resources echobase-ui/src/main/resources/config echobase-ui/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 23 Sep '12

23 Sep '12

Author: tchemit Date: 2012-09-23 14:33:53 +0200 (Sun, 23 Sep 2012) New Revision: 702 Url: http://forge.codelutin.com/repositories/revision/echobase/702 Log: - fix exception in remove data - add interceptor to check if working db is selected (otherwise redirect to home) Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.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/CommonAllRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml trunk/echobase-ui/src/main/resources/config/struts-importData.xml trunk/echobase-ui/src/main/resources/config/struts-importDb.xml trunk/echobase-ui/src/main/resources/config/struts-removeData.xml trunk/echobase-ui/src/main/resources/config/struts-user.xml trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties trunk/echobase-ui/src/main/resources/struts.xml 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 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-23 12:33:53 UTC (rev 702) @@ -113,7 +113,7 @@ this.progressModel = progressModel; } - public abstract long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException; + public abstract long computeNbSteps(Voyage voyage, ImportLog importLog); protected abstract void removeImportData(Voyage voyage, String id) throws TopiaException; @@ -401,11 +401,15 @@ } - protected long countCategoryUsingEchotype(final Voyage voyage) throws TopiaException { + protected long countCategoryUsingEchotype(final Voyage voyage) { String hql = "SELECT COUNT(DISTINCT c) FROM VoyageImpl v, CategoryImpl c WHERE " + "v = :voyage AND c.echotype in elements(v.echotype)"; - long result = categoryDAO.countByQuery(hql, "voyage", voyage); - return result; + try { + long result = categoryDAO.countByQuery(hql, "voyage", voyage); + return result; + } catch (TopiaException e) { + throw new EchoBaseTechnicalException(e); + } } public void incrementOp(String message) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:33:53 UTC (rev 702) @@ -55,7 +55,7 @@ } @Override - public long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException { + public long computeNbSteps(Voyage voyage, ImportLog importLog) { long result = importLog.sizeImportId(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:33:53 UTC (rev 702) @@ -55,7 +55,7 @@ } @Override - public long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException { + public long computeNbSteps(Voyage voyage, ImportLog importLog) { long result = importLog.sizeImportId(); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/AbstractCheckInterceptor.java 2012-09-23 12:33:53 UTC (rev 702) @@ -63,8 +63,8 @@ if (!check) { String redirectUrl = getRedirectUrl(); - if (log.isInfoEnabled()) { - log.info("Will redirect to " + redirectUrl); + if (log.isDebugEnabled()) { + log.debug("Will redirect to " + redirectUrl); } redirect(redirectUrl); Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckLogguedInterceptor.java 2012-09-23 12:33:53 UTC (rev 702) @@ -87,8 +87,10 @@ } return true; } - if (log.isInfoEnabled()) { - log.info("No user loggued!"); + } + if (!userLoggued) { + if (log.isDebugEnabled()) { + log.debug("User is not loggued, will redirect to home"); } } return userLoggued; Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckUserIsAdmin.java 2012-09-23 12:33:53 UTC (rev 702) @@ -28,6 +28,8 @@ import fr.ifremer.echobase.entities.EchoBaseUser; import fr.ifremer.echobase.ui.EchoBaseSession; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; /** * To check if logged user is admin. @@ -39,6 +41,9 @@ private static final long serialVersionUID = 1L; + /** Logger. */ + private static final Log log = LogFactory.getLog(CheckUserIsAdmin.class); + @Override protected boolean doCheck(ActionInvocation invocation) { EchoBaseActionSupport action = (EchoBaseActionSupport) invocation.getAction(); @@ -48,6 +53,12 @@ EchoBaseUser user = echoBaseSession.getUser(); Preconditions.checkNotNull(user, "No user found is session"); - return user.isAdmin(); + boolean admin = user.isAdmin(); + if (!admin) { + if (log.isDebugEnabled()) { + log.debug("User is not admin, will redirect to home"); + } + } + return admin; } } Added: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java (rev 0) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java 2012-09-23 12:33:53 UTC (rev 702) @@ -0,0 +1,41 @@ +package fr.ifremer.echobase.ui.interceptors; + +import com.opensymphony.xwork2.ActionInvocation; +import fr.ifremer.echobase.ui.EchoBaseSession; +import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; + +import static org.nuiton.i18n.I18n.l_; + +/** + * Checks that a working db was selected, otherwise redirect to home. + * + * @author tchemit <chemit(a)codelutin.com> + * @since 1.3 + */ +public class CheckWorkingDbSelected extends AbstractCheckInterceptor { + + private static final long serialVersionUID = 1L; + + /** Logger. */ + private static final Log log = + LogFactory.getLog(CheckLogguedInterceptor.class); + + @Override + protected boolean doCheck(ActionInvocation invocation) { + EchoBaseActionSupport action = (EchoBaseActionSupport) + invocation.getAction(); + + EchoBaseSession echoBaseSession = action.getEchoBaseSession(); + boolean dbSelected = echoBaseSession.isWorkingDbSelected(); + if (!dbSelected) { + action.addFlashMessage(l_(action.getLocale(), + "echobase.info.no.workingDb.selected")); + if (log.isDebugEnabled()) { + log.debug("No working db selected, will redirect to home"); + } + } + return dbSelected; + } +} Property changes on: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/interceptors/CheckWorkingDbSelected.java ___________________________________________________________________ Added: svn:keywords + Author Date Id Revision Added: svn:eol-style + native Modified: trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-dbeditor.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -29,7 +29,7 @@ <struts> - <package name="dbeditor" extends="loggued" namespace="/dbeditor"> + <package name="dbeditor" extends="logguedAndWithDb" namespace="/dbeditor"> <result-types> <result-type name="redirectToDbEditor" @@ -44,7 +44,7 @@  <action name="dbeditor" method="input" class="fr.ifremer.echobase.ui.actions.dbeditor.LoadEntities"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/dbeditor/dbeditor.jsp</result> </action> Modified: trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-embeddedApplication.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -29,13 +29,13 @@ <struts> - <package name="embeddedApplication" extends="loggued" + <package name="embeddedApplication" extends="logguedAndWithDb" namespace="/embeddedApplication">  <action name="configure" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Configure"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input"> /WEB-INF/jsp/embeddedApplication/configure.jsp </result> @@ -48,7 +48,7 @@  <action name="build" method="execute" class="fr.ifremer.echobase.ui.actions.embeddedApplication.Build"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/embeddedApplication/progress.jsp</result> <result type="redirectAction"> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-exportDb.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -28,7 +28,7 @@ <struts> - <package name="exportDb" extends="loggued" namespace="/exportDb"> + <package name="exportDb" extends="logguedAndWithDb" namespace="/exportDb">  <action name="configureInput" method="input" @@ -39,7 +39,7 @@  <action name="configure" method="execute" class="fr.ifremer.echobase.ui.actions.exportDb.Configure"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/exportDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/exportDb</param> @@ -50,7 +50,7 @@  <action name="export" method="execute" class="fr.ifremer.echobase.ui.actions.exportDb.Export"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/exportDb/progress.jsp</result> <result type="redirectAction"> @@ -68,7 +68,7 @@  <action name="download" class="fr.ifremer.echobase.ui.actions.exportDb.Download"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-exportQuery.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -29,7 +29,7 @@ <struts> - <package name="exportQuery" extends="loggued" namespace="/exportQuery"> + <package name="exportQuery" extends="logguedAndWithDb" namespace="/exportQuery"> <result-types> <result-type name="redirectExportQuery" @@ -48,9 +48,10 @@ <interceptors>  - <interceptor-stack name="paramsPrepareParamsStackLoggued"> + <interceptor-stack name="paramsPrepareParamsStackLogguedWithDb"> <interceptor-ref name="i18n"/> <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="checkWorkingDbSelected"/> <interceptor-ref name="paramsPrepareParamsStack"/> </interceptor-stack> </interceptors> @@ -58,7 +59,7 @@  <action name="manageExportQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result type="showList"/> </action> @@ -85,7 +86,7 @@  <action name="clone" method="cloneQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result name="input" type="showList"/> <result type="redirectExportQuery"/> </action> @@ -93,7 +94,7 @@  <action name="save" method="saveQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result name="input" type="showList"/> <result type="redirectExportQuery"/> </action> @@ -101,23 +102,22 @@  <action name="confirmDelete" method="confirmDeleteQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result>/WEB-INF/jsp/exportQuery/confirmDelete.jsp</result> </action>  <action name="delete" method="deleteQuery" class="fr.ifremer.echobase.ui.actions.exportQuery.ManageExportQuery"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result name="input" type="showList"/> <result type="redirectExportQuery"/> </action> -  <action name="downloadExportQueryResult" class="fr.ifremer.echobase.ui.actions.exportQuery.DownloadExportQueryResult"> - <interceptor-ref name="paramsPrepareParamsStackLoggued"/> + <interceptor-ref name="paramsPrepareParamsStackLogguedWithDb"/> <result type="stream"> <param name="contentType">${contentType}</param> <param name="contentLength">${contentLength}</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-importData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-importData.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -28,12 +28,12 @@ <struts> - <package name="importData" extends="loggued" namespace="/importData"> + <package name="importData" extends="logguedAndWithDb" namespace="/importData">  <action name="selectImportType" class="fr.ifremer.echobase.ui.actions.importData.SelectImportType"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/importData/selectImportType.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> @@ -45,7 +45,7 @@  <action name="configure*-*" method="{2}" class="fr.ifremer.echobase.ui.actions.importData.Configure{1}Import"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/importData/configure{1}Import.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> @@ -56,7 +56,7 @@  <action name="import*" method="execute" class="fr.ifremer.echobase.ui.actions.importData.Launch{1}Import"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/importData/progress{1}Import.jsp</result> <result type="redirectAction"> @@ -86,7 +86,7 @@  <action name="createMission" class="fr.ifremer.echobase.ui.actions.importData.CreateMission"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/importData/createMission.jsp</result> <result type="redirectAction"> <param name="namespace">/importData</param> Modified: trunk/echobase-ui/src/main/resources/config/struts-importDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-importDb.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -28,7 +28,7 @@ <struts> - <package name="importDb" extends="loggued" namespace="/importDb"> + <package name="importDb" extends="logguedAndWithDb" namespace="/importDb">  <action name="configureInput" method="input" @@ -39,7 +39,7 @@  <action name="configure" method="execute" class="fr.ifremer.echobase.ui.actions.importDb.Configure"> - <interceptor-ref name="prepareParamsStackLoggued"/> + <interceptor-ref name="prepareParamsStackLogguedWithDb"/> <result name="input">/WEB-INF/jsp/importDb/configure.jsp</result> <result type="redirectAction"> <param name="namespace">/importDb</param> @@ -50,7 +50,7 @@  <action name="import" method="execute" class="fr.ifremer.echobase.ui.actions.importDb.Import"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/importDb/progress.jsp</result> <result type="redirectAction"> Modified: trunk/echobase-ui/src/main/resources/config/struts-removeData.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-removeData.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-removeData.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -26,7 +26,7 @@ <struts> - <package name="removeData" extends="loggued" namespace="/removeData"> + <package name="removeData" extends="logguedAndWithDb" namespace="/removeData">  <action name="confirmDelete" @@ -41,7 +41,7 @@  <action name="delete" method="execute" class="fr.ifremer.echobase.ui.actions.removeData.Delete"> - <interceptor-ref name="basicStackLoggued"/> + <interceptor-ref name="basicStackLogguedWithdb"/> <interceptor-ref name="execAndWait"/> <result name="wait">/WEB-INF/jsp/removeData/deleteProgress.jsp</result> <result type="redirectAction"> Modified: trunk/echobase-ui/src/main/resources/config/struts-user.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-user.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -31,8 +31,6 @@ <package name="user" extends="loggued" namespace="/user"> - <default-interceptor-ref name="basicStackLoggued"/> -  <action name="login" class="fr.ifremer.echobase.ui.actions.user.Login" method="execute"> Modified: trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml =================================================================== --- trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/config/struts-workingDb.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -47,6 +47,7 @@  <action name="information" class="fr.ifremer.echobase.ui.actions.workingDb.Information"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result>/WEB-INF/jsp/workingDb/information.jsp</result> </action> @@ -114,6 +115,7 @@  <action name="logs" class="fr.ifremer.echobase.ui.actions.EchoBaseActionSupport"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result>/WEB-INF/jsp/workingDb/modifications.jsp</result> </action> @@ -130,12 +132,14 @@  <action name="getEntityModificationLogs" method="entityModificationLogs" class="fr.ifremer.echobase.ui.actions.dbeditor.GetEntities"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="jsonWithPager"/> </action>  <action name="getDashboardImportLogs" method="dashboardImportLogs" class="fr.ifremer.echobase.ui.actions.dbeditor.GetEntities"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="jsonWithPager"/> </action> @@ -143,18 +147,21 @@  <action name="getDashboardImportLog" method="execute" class="fr.ifremer.echobase.ui.actions.workingDb.GetImportLogDetail"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="json"/> </action>  <action name="getDashboardVoyage" method="execute" class="fr.ifremer.echobase.ui.actions.workingDb.GetVoyage"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result type="json"/> </action>  <action name="dashboard" method="execute" class="fr.ifremer.echobase.ui.actions.workingDb.DashBoard"> + <interceptor-ref name="basicStackLogguedWithdb"/> <result>/WEB-INF/jsp/workingDb/dashboard.jsp</result> </action> </package> Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-09-23 12:33:53 UTC (rev 702) @@ -246,6 +246,7 @@ echobase.info.no.sqlQuery.selected=No SQL query selected echobase.info.no.table.selected=No table selected echobase.info.no.voyagee.found=No survey selected +echobase.info.no.workingDb.selected=No working database selected echobase.info.no.workingDbConfiguration.saved=No working database configuration saved echobase.info.no.workingDbConfiguration.selected=Select a working database configuration and then connect echobase.info.removeData.failed=Import removal failed Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties =================================================================== --- trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-09-23 12:33:53 UTC (rev 702) @@ -246,6 +246,7 @@ echobase.info.no.sqlQuery.selected=Aucune requête d'export SQL sélectionnée echobase.info.no.table.selected=Aucune table sélectionnée echobase.info.no.voyagee.found=Aucune campagne à exporter +echobase.info.no.workingDb.selected=Aucune base de travail de sélectionnée echobase.info.no.workingDbConfiguration.saved=Aucune configuration de base de travail enregistrée echobase.info.no.workingDbConfiguration.selected=Sélectionner une configuration pour ensuite vous y connecter echobase.info.removeData.failed=La suppresion de l'import a échoué Modified: trunk/echobase-ui/src/main/resources/struts.xml =================================================================== --- trunk/echobase-ui/src/main/resources/struts.xml 2012-09-23 12:06:48 UTC (rev 701) +++ trunk/echobase-ui/src/main/resources/struts.xml 2012-09-23 12:33:53 UTC (rev 702) @@ -58,7 +58,8 @@ <param name="namespace">/</param> </result-type> <result-type name="json" class="org.apache.struts2.json.JSONResult"/> - <result-type name="jsonWithPager" class="org.apache.struts2.json.JSONResult"> + <result-type name="jsonWithPager" + class="org.apache.struts2.json.JSONResult"> <param name="includeProperties"> rows,page,total,records,datas,datas.*,sord,sidx,filters,searchField,searchString,searchOper </param> @@ -85,6 +86,11 @@ <param name="redirectAction">/home</param> </interceptor> + <interceptor name="checkWorkingDbSelected" + class="fr.ifremer.echobase.ui.interceptors.CheckWorkingDbSelected"> + <param name="redirectAction">/home</param> + </interceptor> + </interceptors>  @@ -123,12 +129,35 @@ <interceptor-ref name="defaultStack"/> </interceptor-stack> +  + <interceptor-stack name="basicStackLogguedWithdb"> + <interceptor-ref name="i18n"/> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="checkWorkingDbSelected"/> + <interceptor-ref name="basicStack"/> + </interceptor-stack> + +  + <interceptor-stack name="prepareParamsStackLogguedWithDb"> + <interceptor-ref name="i18n"/> + <interceptor-ref name="checkUserLoggued"/> + <interceptor-ref name="checkWorkingDbSelected"/> + <interceptor-ref name="defaultStack"/> + </interceptor-stack> + </interceptors>  <default-interceptor-ref name="basicStackLoggued"/> </package> + + <package name="logguedAndWithDb" extends="loggued" abstract="true"> + +  + <default-interceptor-ref name="basicStackLogguedWithdb"/> + + </package> <package name="applicationDefault" extends="default" namespace="/"> <default-action-ref name="home"/>

1 0

r701 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy
by tchemit＠users.forge.codelutin.com 23 Sep '12

23 Sep '12

Author: tchemit Date: 2012-09-23 14:06:48 +0200 (Sun, 23 Sep 2012) New Revision: 701 Url: http://forge.codelutin.com/repositories/revision/echobase/701 Log: fix build 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/CommonAllRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.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 2012-09-23 12:03:21 UTC (rev 700) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) @@ -113,7 +113,7 @@ this.progressModel = progressModel; } - public abstract long computeNbSteps(Voyage voyage, ImportLog importLog); + public abstract long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException; protected abstract void removeImportData(Voyage voyage, String id) throws TopiaException; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:03:21 UTC (rev 700) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) @@ -55,7 +55,7 @@ } @Override - public long computeNbSteps(Voyage voyage, ImportLog importLog) { + public long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException { long result = importLog.sizeImportId(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:03:21 UTC (rev 700) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:06:48 UTC (rev 701) @@ -31,7 +31,6 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; -import java.util.List; import java.util.Set; /** @@ -56,7 +55,7 @@ } @Override - public long computeNbSteps(Voyage voyage, ImportLog importLog) { + public long computeNbSteps(Voyage voyage, ImportLog importLog) throws TopiaException { long result = importLog.sizeImportId();

1 0

r700 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy
by tchemit＠users.forge.codelutin.com 23 Sep '12

23 Sep '12

Author: tchemit Date: 2012-09-23 14:03:21 +0200 (Sun, 23 Sep 2012) New Revision: 700 Url: http://forge.codelutin.com/repositories/revision/echobase/700 Log: refs #1437: Suppression des imports (suppression des Category li?\195?\169es aux echotypes) 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/CommonAllRemoveDataStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.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 2012-09-23 10:41:45 UTC (rev 699) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/AbstractRemoveDataStrategy.java 2012-09-23 12:03:21 UTC (rev 700) @@ -128,7 +128,6 @@ for (String importId : importLog.getImportId()) { - try { removeImportData(voyage, importId); } catch (TopiaException e) { @@ -161,6 +160,27 @@ " from service " + this); } + protected void removeVoyage(Voyage entity) throws TopiaException { + + // get categories to remove after + List<Category> categories = getCategoryUsingEchotype(entity); + + // dettach obsolete categories from their echotypes + for (Category category : categories) { + category.setEchotype(null); + } + + // delete it + delete(voyageDao, entity); + + // remove obsolete categories + for (Category category : categories) { + + categoryDAO.delete(category); + incrementOp("Remove orphan category " + category.getTopiaId()); + } + } + protected void removeLengthWeightKey(Voyage entity, LengthWeightKey lengthWeightKey) throws TopiaException { @@ -187,7 +207,6 @@ incrementOp("Remove lengthAgeKey " + lengthAgeKey.getTopiaId()); } - protected void removeEchotype(Voyage entity, Echotype echotype) throws TopiaException { @@ -374,6 +393,21 @@ } } + private List<Category> getCategoryUsingEchotype(final Voyage voyage) throws TopiaException { + String hql = "SELECT DISTINCT c FROM VoyageImpl v, CategoryImpl c WHERE " + + "v = :voyage AND c.echotype in elements(v.echotype)"; + List<Category> result = categoryDAO.findAllByQuery(hql, "voyage", voyage); + return result; + } + + + protected long countCategoryUsingEchotype(final Voyage voyage) throws TopiaException { + String hql = "SELECT COUNT(DISTINCT c) FROM VoyageImpl v, CategoryImpl c WHERE " + + "v = :voyage AND c.echotype in elements(v.echotype)"; + long result = categoryDAO.countByQuery(hql, "voyage", voyage); + return result; + } + public void incrementOp(String message) { opIndex++; if (opIndex % 1000 == 0) { Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 10:41:45 UTC (rev 699) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/CommonAllRemoveDataStrategy.java 2012-09-23 12:03:21 UTC (rev 700) @@ -59,6 +59,9 @@ long result = importLog.sizeImportId(); + // add all categories to be removed after + result += countCategoryUsingEchotype(voyage); + // add all orphan cells result += countVoyageOrphanCells(voyage); return result; @@ -73,7 +76,7 @@ Voyage entity = voyageDao.findByTopiaId(id); // delete it - delete(voyageDao, entity); + removeVoyage(entity); if (log.isDebugEnabled()) { log.debug(entity.getTopiaId() + " was removed"); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 10:41:45 UTC (rev 699) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/LegacyVoyageRemoveDataStrategy.java 2012-09-23 12:03:21 UTC (rev 700) @@ -31,6 +31,7 @@ import org.apache.commons.logging.LogFactory; import org.nuiton.topia.TopiaException; +import java.util.List; import java.util.Set; /** @@ -59,6 +60,9 @@ long result = importLog.sizeImportId(); + // add all categories to be removed after + result += countCategoryUsingEchotype(voyage); + // add all orphan cells result += countVoyageOrphanCells(voyage); return result; @@ -73,7 +77,7 @@ Voyage entity = voyageDao.findByTopiaId(id); // delete it - delete(voyageDao, entity); + removeVoyage(entity); if (log.isDebugEnabled()) { log.debug(entity.getTopiaId() + " was removed");

1 0

r699 - in trunk: echobase-domain/src/main/java/fr/ifremer/echobase/persistence echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy
by tchemit＠users.forge.codelutin.com 23 Sep '12

23 Sep '12

Author: tchemit Date: 2012-09-23 12:41:45 +0200 (Sun, 23 Sep 2012) New Revision: 699 Url: http://forge.codelutin.com/repositories/revision/echobase/699 Log: fix api Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java Modified: trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java =================================================================== --- trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2012-09-23 10:34:51 UTC (rev 698) +++ trunk/echobase-domain/src/main/java/fr/ifremer/echobase/persistence/EchoBasePersistenceHelper.java 2012-09-23 10:41:45 UTC (rev 699) @@ -23,11 +23,13 @@ * #L% */ +import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseDAOHelper; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; import org.nuiton.topia.TopiaRuntimeException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; import org.nuiton.topia.persistence.TopiaPersistenceHelper; @@ -60,4 +62,12 @@ return (TopiaDAO<E>) getDAO(tx, type.getContract()); } + public final void flushTransaction(TopiaContext tx, String errorMessage) { + try { + ((TopiaContextImplementor) tx).getHibernate().flush(); + } catch (TopiaException e) { + throw new EchoBaseTechnicalException(errorMessage, e); + } + } + } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java 2012-09-23 10:34:51 UTC (rev 698) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java 2012-09-23 10:41:45 UTC (rev 699) @@ -121,11 +121,11 @@ } } - public static <T extends TopiaEntityEnum, E extends TopiaEntity> void importAllEntitiesIfNotExisting(TopiaDAO<E> dao, - TableMeta<T> meta, - Import<E> importer, - CsvImportResult<T> csvResult, - int nbRowBuffer) throws TopiaException { + public <T extends TopiaEntityEnum, E extends TopiaEntity> void importAllEntitiesIfNotExisting(TopiaDAO<E> dao, + TableMeta<T> meta, + Import<E> importer, + CsvImportResult<T> csvResult, + int nbRowBuffer) throws TopiaException { TopiaContextImplementor context = dao.getContext(); @@ -145,7 +145,8 @@ compt++; if (compt % nbRowBuffer == 0) { // flush it - context.getHibernate().flush(); + persistenceHelper.flushTransaction( + context, "could not flush transaction"); } }

1 0

r698 - in trunk/echobase-services/src/main/java/fr/ifremer/echobase/services: importdata importdb/strategy
by tchemit＠users.forge.codelutin.com 23 Sep '12

23 Sep '12

Author: tchemit Date: 2012-09-23 12:34:51 +0200 (Sun, 23 Sep 2012) New Revision: 698 Url: http://forge.codelutin.com/repositories/revision/echobase/698 Log: check if strategy exist before import it (special dirty case...) Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-09-23 09:48:45 UTC (rev 697) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-09-23 10:34:51 UTC (rev 698) @@ -116,7 +116,7 @@ Map<String, Cell> esduCellMap = Maps.uniqueIndex( dataProcessing.getCell(), EchoBaseFunctions.CELL_BY_NAME); - // index all echotypes of thi voyage + // index all echotypes of this voyage Map<String, Echotype> echotypeMap = Maps.uniqueIndex( voyage.getEchotype(), EchoBaseFunctions.ECHOTYPE_NAME); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java 2012-09-23 09:48:45 UTC (rev 697) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/DataImportDbStrategy.java 2012-09-23 10:34:51 UTC (rev 698) @@ -70,7 +70,6 @@ "In data import, can not accept " + "referential type, but found some referential files: " + badTableTypes); } - } @Override Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java 2012-09-23 09:48:45 UTC (rev 697) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdb/strategy/EchoBaseImportStrategy.java 2012-09-23 10:34:51 UTC (rev 698) @@ -27,8 +27,11 @@ import fr.ifremer.echobase.persistence.EchoBasePersistenceHelper; import org.nuiton.topia.TopiaContext; import org.nuiton.topia.TopiaException; +import org.nuiton.topia.framework.TopiaContextImplementor; import org.nuiton.topia.persistence.TopiaDAO; import org.nuiton.topia.persistence.TopiaEntity; +import org.nuiton.topia.persistence.TopiaEntityEnum; +import org.nuiton.topia.persistence.csv.CsvProgressModel; import org.nuiton.topia.persistence.csv.in.CsvImportResult; import org.nuiton.topia.persistence.csv.in.ImportModelFactory; import org.nuiton.topia.persistence.csv.in.ImportStrategy; @@ -38,6 +41,8 @@ import org.nuiton.util.csv.Import; import org.nuiton.util.csv.ImportToMap; +import java.util.Map; + /** * How to import csv files. * @@ -74,7 +79,14 @@ CsvImportResult<EchoBaseEntityEnum> csvResult) throws TopiaException { TopiaDAO<E> dao = persistenceHelper.getDAO(tx, meta.getSource()); - TopiaCsvImports.importAllEntities(dao, meta, importer, csvResult, nbRowBuffer); + if (meta.getSource() == EchoBaseEntityEnum.Category) { + + // special case, test if exists before to add it, otherwise skip it + importAllEntitiesIfNotExisting(dao, meta, importer, csvResult, nbRowBuffer); + + } else { + TopiaCsvImports.importAllEntities(dao, meta, importer, csvResult, nbRowBuffer); + } } @Override @@ -107,6 +119,43 @@ csvResult, nbRowBuffer); } + } + public static <T extends TopiaEntityEnum, E extends TopiaEntity> void importAllEntitiesIfNotExisting(TopiaDAO<E> dao, + TableMeta<T> meta, + Import<E> importer, + CsvImportResult<T> csvResult, + int nbRowBuffer) throws TopiaException { + + TopiaContextImplementor context = dao.getContext(); + + CsvProgressModel progressModel = csvResult == null ? null : + csvResult.getProgressModel(); + + int compt = 0; + for (E entity : importer) { + + if (!dao.existByTopiaId(entity.getTopiaId())) { + + Map<String, Object> properties = meta.prepareCreate( + entity, entity.getTopiaId()); + E entityToSave = dao.create(properties); + + meta.copy(entity, entityToSave); + compt++; + if (compt % nbRowBuffer == 0) { + // flush it + context.getHibernate().flush(); + } + } + + if (csvResult != null) { + csvResult.incrementsNumberUpdated(); + if (progressModel != null) { + progressModel.incrementsProgress(); + } + } + + } } }

1 0

r697 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 23 Sep '12

23 Sep '12

Author: tchemit Date: 2012-09-23 11:48:45 +0200 (Sun, 23 Sep 2012) New Revision: 697 Url: http://forge.codelutin.com/repositories/revision/echobase/697 Log: fix dbeditor search for is null or is not null case for fk Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-09-23 09:26:40 UTC (rev 696) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/DbEditorService.java 2012-09-23 09:48:45 UTC (rev 697) @@ -341,29 +341,38 @@ Object realData = data; if (columnMeta.isFK()) { - // must do a select in using the decoration pattern + if (op==FilterRuleOperator.nu || op==FilterRuleOperator.nn){ - JXPathDecorator<?> decorator = - (JXPathDecorator<?>) getDecorator(columnMeta.getType()); + // is null or is not null is a simple case - if (decorator.getNbToken() == 1) { + ruleFilter = op.toHql(propertyName, + propertyName, + data, + filterParams); + } else { + // must do a select in using the decoration pattern + JXPathDecorator<?> decorator = + (JXPathDecorator<?>) getDecorator(columnMeta.getType()); - String fName = "f_" + timestamp + (index++); + if (decorator.getNbToken() == 1) { - // simple case one token - String token = fName + "." + decorator.getProperty(0); + String fName = "f_" + timestamp + (index++); - String subQuery = op.toHql(paramName, - token, - data, - filterParams); + // simple case one token + String token = fName + "." + decorator.getProperty(0); - ruleFilter = propertyName + " IN ( SELECT f FROM " + - columnMeta.getType().getName() + " " + - fName + " WHERE " + subQuery + ")"; - } else { + String subQuery = op.toHql(paramName, + token, + data, + filterParams); - throw new UnsupportedOperationException(); + ruleFilter = propertyName + " IN ( SELECT f FROM " + + columnMeta.getType().getName() + " " + + fName + " WHERE " + subQuery + ")"; + } else { + + throw new UnsupportedOperationException(); + } } } else {

1 0

r696 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy
by tchemit＠users.forge.codelutin.com 23 Sep '12

23 Sep '12

Author: tchemit Date: 2012-09-23 11:26:40 +0200 (Sun, 23 Sep 2012) New Revision: 696 Url: http://forge.codelutin.com/repositories/revision/echobase/696 Log: fix count model Modified: 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/ResultVoyageRemoveDataStrategy.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/ResultVoyageRemoveDataStrategy.java 2012-09-22 16:25:23 UTC (rev 695) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/removedata/strategy/ResultVoyageRemoveDataStrategy.java 2012-09-23 09:26:40 UTC (rev 696) @@ -61,9 +61,6 @@ // add all postCell result += voyage.sizePostCell(); - - // add all orphan cells - result += countVoyageOrphanCells(voyage); return result; }

1 0