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 4c2f27a03dc226ca3ff1f6830759b9583874513d Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 14 15:33:52 2015 +0100 fixes #6456: Ne plus rafraichir les données spatiales à la fin d'un import --- .../importdata/AbstractImportDataService.java | 9 --------- .../services/service/importdb/ImportDbService.java | 22 ++-------------------- 2 files changed, 2 insertions(+), 29 deletions(-) diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java index 75098d2..5ed3de2 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdata/AbstractImportDataService.java @@ -44,7 +44,6 @@ import fr.ifremer.echobase.entities.references.SpeciesCategory; import fr.ifremer.echobase.io.InputFile; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.service.UserDbPersistenceService; -import fr.ifremer.echobase.services.service.spatial.SpatialDataService; import org.apache.commons.lang3.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -89,9 +88,6 @@ public abstract class AbstractImportDataService<M extends AbstractImportConfigur @Inject protected UserDbPersistenceService persistenceService; - @Inject - private SpatialDataService spatialDataService; - public final String doImport(M configuration, EchoBaseUser user) throws ImportException { @@ -116,11 +112,6 @@ public abstract class AbstractImportDataService<M extends AbstractImportConfigur // do commit persistenceService.commit(); - // update sql spatial data - spatialDataService.updatePostgisTable(); - - s0 = TIME_LOG.log(s0, "postgis update"); - TIME_LOG.log(s0, "importCommited"); return result; diff --git a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java index 2a18376..2328aed 100644 --- a/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java +++ b/echobase-services/src/main/java/fr/ifremer/echobase/services/service/importdb/ImportDbService.java @@ -22,16 +22,13 @@ package fr.ifremer.echobase.services.service.importdb; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.entities.EchoBaseUser; -import fr.ifremer.echobase.entities.EchoBaseUserPersistenceContext; import fr.ifremer.echobase.services.EchoBaseServiceSupport; import fr.ifremer.echobase.services.service.importdata.ImportException; import fr.ifremer.echobase.services.service.importdb.strategy.AbstractImportDbStrategy; import fr.ifremer.echobase.services.service.importdb.strategy.FreeImportDbStrategy; import fr.ifremer.echobase.services.service.importdb.strategy.ReferentialImportDbStrategy; -import fr.ifremer.echobase.services.service.spatial.SpatialDataService; import org.nuiton.topia.persistence.TopiaException; -import javax.inject.Inject; import java.io.IOException; /** @@ -42,14 +39,7 @@ import java.io.IOException; */ public class ImportDbService extends EchoBaseServiceSupport { - @Inject - private EchoBaseUserPersistenceContext persistenceContext; - - @Inject - private SpatialDataService spatialDataService; - - public void doImport(ImportDbConfiguration model, - EchoBaseUser user) throws ImportException { + public void doImport(ImportDbConfiguration model, EchoBaseUser user) throws ImportException { ImportDbMode importDbMode = model.getImportDbMode(); @@ -69,18 +59,10 @@ public class ImportDbService extends EchoBaseServiceSupport { try { strategy.doImport(model, user); - } catch (IOException e) { - throw new ImportException("Could not import db", e); - } catch (TopiaException e) { + } catch (IOException | TopiaException e) { throw new ImportException("Could not import db", e); } - if (ImportDbMode.REFERENTIAL != importDbMode && persistenceContext.isSpatialStructureFound()) { - - // let's update postgis table - spatialDataService.updatePostgisTable(); - - } } } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.