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

r519 - in trunk: echobase-services/src/main/java/fr/ifremer/echobase/services echobase-services/src/test/java/fr/ifremer/echobase/services echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb
by tchemit＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: tchemit Date: 2012-04-10 22:46:01 +0200 (Tue, 10 Apr 2012) New Revision: 519 Url: http://forge.codelutin.com/repositories/revision/echobase/519 Log: try to fix again create embedded application :( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-04-10 20:02:10 UTC (rev 518) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/EmbeddedApplicationService.java 2012-04-10 20:46:01 UTC (rev 519) @@ -358,7 +358,7 @@ ImportDbService importDbService = newServiceContext.newService(ImportDbService.class); - importDbService.importDb(importConfiguration, admin, false); + importDbService.importDb(importConfiguration, admin, false, true); } } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-04-10 20:02:10 UTC (rev 518) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ImportDbService.java 2012-04-10 20:46:01 UTC (rev 519) @@ -71,15 +71,17 @@ /** * Import a complete db from the given zip file. * - * @param model model of the db import operation - * @param user user which perform the import - * @param computeSteps flag to compute stesp inside this method + * @param model model of the db import operation + * @param user user which perform the import + * @param computeSteps flag to compute stesp inside this method + * @param commitAfterEachFile flag to commit after each imported file * @throws IOException if any io exception while import * @throws TopiaException if any pb while topia treatment */ public void importDb(ImportDbConfiguration model, EchoBaseUser user, - boolean computeSteps) throws IOException, TopiaException { + boolean computeSteps, + boolean commitAfterEachFile) throws IOException, TopiaException { File file = model.getInput().getFile(); @@ -125,6 +127,12 @@ importFile(entryDef, reader, csvResult); } finally { reader.close(); + + if (commitAfterEachFile) { + commitTransaction( + "Could not commit db import from file " + + file + "#" + entryDef.getFilename()); + } } } Modified: trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java =================================================================== --- trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-04-10 20:02:10 UTC (rev 518) +++ trunk/echobase-services/src/test/java/fr/ifremer/echobase/services/ImportDbServiceTest.java 2012-04-10 20:46:01 UTC (rev 519) @@ -62,7 +62,7 @@ EchoBaseUser user = new EchoBaseUserImpl(); user.setEmail("testUser(a)fake.fr"); - service.importDb(conf, user, true); + service.importDb(conf, user, true, false); Assert.assertEquals(100f, conf.getProgression(), 1); } Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-04-10 20:02:10 UTC (rev 518) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/importDb/Import.java 2012-04-10 20:46:01 UTC (rev 519) @@ -65,7 +65,7 @@ model.getInput().getFileName()); } - service.importDb(model, getEchoBaseSession().getEchoBaseUser(), true); + service.importDb(model, getEchoBaseSession().getEchoBaseUser(), true, false); } @Override

1 0

r518 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase/entities echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: tchemit Date: 2012-04-10 22:02:10 +0200 (Tue, 10 Apr 2012) New Revision: 518 Url: http://forge.codelutin.com/repositories/revision/echobase/518 Log: refs #1102: La cr?\195?\169ation d'une base embarqu?\195?\169e ne fonctionne pas avec les donn?\195?\169es 2011 Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-04-10 18:05:02 UTC (rev 517) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-04-10 20:02:10 UTC (rev 518) @@ -139,13 +139,12 @@ return entities.toArray(new MetaFilenameAware[entities.size()]); } - public static MetaFilenameAware[] getReferenceEntries(DbMeta dbMeta, EchoBaseEntityEnum... extraTypes) { + public static MetaFilenameAware[] getReferenceEntries(DbMeta dbMeta) { List<MetaFilenameAware> entities = Lists.newArrayList(); List<MetaFilenameAware> associations = Lists.newArrayList(); addEntries(dbMeta, entities, associations, getReferenceTypes()); - addEntries(dbMeta, entities, associations, extraTypes); entities.addAll(associations); return entities.toArray(new MetaFilenameAware[entities.size()]); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-04-10 18:05:02 UTC (rev 517) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-04-10 20:02:10 UTC (rev 518) @@ -125,10 +125,9 @@ ExportService exportService = getService(ExportService.class); - // export all referentiel + category (defined for all datas) - MetaFilenameAware[] refEntries = - EntitiesUtil.getReferenceEntries(getDbMeta(), - EchoBaseEntityEnum.Category); + // export all referentiel + MetaFilenameAware[] refEntries = EntitiesUtil.getReferenceEntries( + getDbMeta()); boolean withVoyages = model.getVoyageIds() != null; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 18:05:02 UTC (rev 517) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 20:02:10 UTC (rev 518) @@ -26,10 +26,12 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.csv.EntityExportContext; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Result; import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.MetaFilenameAware; @@ -47,6 +49,7 @@ import java.io.File; import java.util.Collection; import java.util.Map; +import java.util.Set; /** * entity visitor to export data to csv files. @@ -63,10 +66,6 @@ public static final TimeLog TIME_LOG = new TimeLog(ReplicateEntityVisitor.class); -// protected Set<String> ids = Sets.newHashSetWithExpectedSize(2000000000); -// -// protected Deque<String> stack = new ArrayDeque<String>(); - public static ReplicateEntityVisitor createVisitor(ExportService service, MetaFilenameAware[] entityMetas, Multimap<EchoBaseEntityEnum, MetaFilenameAware> associations, @@ -114,8 +113,11 @@ /** Export for simple entity. */ protected final Map<Class<?>, EntityExportContext> entityExporters; + protected final Set<String> categoryIds; + public ReplicateEntityVisitor(Map<Class<?>, EntityExportContext> entityExporters) { this.entityExporters = entityExporters; + categoryIds = Sets.newHashSet(); } public void export(TopiaEntity entity) { @@ -135,16 +137,6 @@ public void start(TopiaEntity entity) { String topiaId = entity.getTopiaId(); try { -// stack.push(topiaId); -// boolean added = ids.add(topiaId); -// if (!added) { -// -// // Never do me! can not accept to treat twice an object -// throw new EchoBaseTechnicalException( -// "Wanted to treat twice entity " + topiaId + -// "\n Current stack " + stack.toString()); -// -// } if (log.isDebugEnabled()) { log.debug("Starts export of entity " + topiaId); } @@ -163,7 +155,6 @@ @Override public void end(TopiaEntity entity) { -// stack.pop(); try { if (log.isDebugEnabled()) { log.debug("Starts export of association of entity " + @@ -186,7 +177,23 @@ @Override public void visit(TopiaEntity entity, String propertyName, Class<?> type, Object value) { - // do nothing + if (Result.PROPERTY_CATEGORY.equals(propertyName) && + entity instanceof Result) { + + // export category + try { + TopiaEntity topiaEntity = (TopiaEntity) value; + if (categoryIds.add(topiaEntity.getTopiaId())) { + // add this new category + topiaEntity.accept(this); + } + + } catch (TopiaException e) { + if (log.isErrorEnabled()) { + log.error("Can not visit entity " + value, e); + } + } + } } @Override @@ -241,6 +248,8 @@ // use at the end of visit (or later) + categoryIds.clear(); + for (EntityExportContext exportContext : entityExporters.values()) { IOUtils.closeQuietly(exportContext); }

1 0

r517 - in trunk: echobase-entities/src/main/java/fr/ifremer/echobase/entities echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: tchemit Date: 2012-04-10 20:05:02 +0200 (Tue, 10 Apr 2012) New Revision: 517 Url: http://forge.codelutin.com/repositories/revision/echobase/517 Log: refs #1102: La cr?\195?\169ation d'une base embarqu?\195?\169e ne fonctionne pas avec les donn?\195?\169es 2011 Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-04-10 17:46:11 UTC (rev 516) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/EntitiesUtil.java 2012-04-10 18:05:02 UTC (rev 517) @@ -139,12 +139,14 @@ return entities.toArray(new MetaFilenameAware[entities.size()]); } - public static MetaFilenameAware[] getReferenceEntries(DbMeta dbMeta) { + public static MetaFilenameAware[] getReferenceEntries(DbMeta dbMeta, EchoBaseEntityEnum... extraTypes) { List<MetaFilenameAware> entities = Lists.newArrayList(); List<MetaFilenameAware> associations = Lists.newArrayList(); addEntries(dbMeta, entities, associations, getReferenceTypes()); + addEntries(dbMeta, entities, associations, extraTypes); + entities.addAll(associations); return entities.toArray(new MetaFilenameAware[entities.size()]); } Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-04-10 17:46:11 UTC (rev 516) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportDbService.java 2012-04-10 18:05:02 UTC (rev 517) @@ -125,8 +125,10 @@ ExportService exportService = getService(ExportService.class); + // export all referentiel + category (defined for all datas) MetaFilenameAware[] refEntries = - EntitiesUtil.getReferenceEntries(getDbMeta()); + EntitiesUtil.getReferenceEntries(getDbMeta(), + EchoBaseEntityEnum.Category); boolean withVoyages = model.getVoyageIds() != null; Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 17:46:11 UTC (rev 516) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 18:05:02 UTC (rev 517) @@ -212,24 +212,14 @@ ((Cell) currentValue).acceptWithNoChilds(this); } } else { - int i = 0; for (Object currentValue : cValue) { - TopiaEntity currentEntity = (TopiaEntity) currentValue; try { - currentEntity.accept(this); + ((TopiaEntity) currentValue).accept(this); } catch (TopiaException e) { if (log.isErrorEnabled()) { log.error("Can not visit entity " + value, e); } } - visit(entity, - propertyName, - type, - collectionType, - i++, - currentEntity - ); - } } } @@ -243,14 +233,7 @@ int index, Object value) { - // not used here! -// try { -// ((TopiaEntity) value).accept(this); -// } catch (TopiaException e) { -// if (log.isErrorEnabled()) { -// log.error("Can not visit entity " + value, e); -// } -// } + // nothing to do } @Override

1 0

r516 - in trunk/echobase-entities/src/main: java/fr/ifremer/echobase/entities/data xmi
by tchemit＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: tchemit Date: 2012-04-10 19:46:11 +0200 (Tue, 10 Apr 2012) New Revision: 516 Url: http://forge.codelutin.com/repositories/revision/echobase/516 Log: refs #1102: La cr?\195?\169ation d'une base embarqu?\195?\169e ne fonctionne pas avec les donn?\195?\169es 2011 Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java trunk/echobase-entities/src/main/xmi/echobase.zargo Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java 2012-04-10 17:45:16 UTC (rev 515) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/entities/data/CellImpl.java 2012-04-10 17:46:11 UTC (rev 516) @@ -24,7 +24,12 @@ package fr.ifremer.echobase.entities.data; import com.google.common.base.Preconditions; +import fr.ifremer.echobase.entities.references.CellType; +import fr.ifremer.echobase.entities.references.DataQuality; +import org.nuiton.topia.persistence.EntityVisitor; +import java.util.Collection; + public class CellImpl extends CellAbstract { private static final long serialVersionUID = 1L; @@ -44,4 +49,16 @@ } return cell; } + + @Override + public void acceptWithNoChilds(EntityVisitor visitor) { + visitor.start(this); + visitor.visit(this, PROPERTY_NAME, String.class, name); + visitor.visit(this, PROPERTY_DATA, Collection.class, Data.class, data); + visitor.visit(this, PROPERTY_CELL_TYPE, CellType.class, cellType); + visitor.visit(this, PROPERTY_DATA_QUALITY, DataQuality.class, dataQuality); +// visitor.visit(this, PROPERTY_CHILDS, Collection.class, Cell.class, childs); + visitor.visit(this, PROPERTY_RESULT, Collection.class, Result.class, result); + visitor.end(this); + } } //CellImpl Modified: trunk/echobase-entities/src/main/xmi/echobase.zargo =================================================================== (Binary files differ)

1 0

r515 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: tchemit Date: 2012-04-10 19:45:16 +0200 (Tue, 10 Apr 2012) New Revision: 515 Url: http://forge.codelutin.com/repositories/revision/echobase/515 Log: fixes #1102: La cr?\195?\169ation d'une base embarqu?\195?\169e ne fonctionne pas avec les donn?\195?\169es 2011 Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 17:06:05 UTC (rev 514) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 17:45:16 UTC (rev 515) @@ -26,10 +26,11 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; -import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.csv.EntityExportContext; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; +import fr.ifremer.echobase.entities.data.Cell; +import fr.ifremer.echobase.entities.data.Voyage; import fr.ifremer.echobase.entities.meta.AssociationMeta; import fr.ifremer.echobase.entities.meta.MetaFilenameAware; import fr.ifremer.echobase.entities.meta.TableMeta; @@ -44,11 +45,8 @@ import org.nuiton.util.csv.ExportModel; import java.io.File; -import java.util.ArrayDeque; import java.util.Collection; -import java.util.Deque; import java.util.Map; -import java.util.Set; /** * entity visitor to export data to csv files. @@ -65,10 +63,10 @@ public static final TimeLog TIME_LOG = new TimeLog(ReplicateEntityVisitor.class); - protected Set<String> ids = Sets.newHashSetWithExpectedSize(2000000000); +// protected Set<String> ids = Sets.newHashSetWithExpectedSize(2000000000); +// +// protected Deque<String> stack = new ArrayDeque<String>(); - protected Deque<String> stack = new ArrayDeque<String>(); - public static ReplicateEntityVisitor createVisitor(ExportService service, MetaFilenameAware[] entityMetas, Multimap<EchoBaseEntityEnum, MetaFilenameAware> associations, @@ -137,16 +135,16 @@ public void start(TopiaEntity entity) { String topiaId = entity.getTopiaId(); try { - stack.push(topiaId); - boolean added = ids.add(topiaId); - if (!added) { - - // Never do me! can not accept to treat twice an object - throw new EchoBaseTechnicalException( - "Wanted to treat twice entity " + topiaId + - "\n Current stack " + stack.toString()); - - } +// stack.push(topiaId); +// boolean added = ids.add(topiaId); +// if (!added) { +// +// // Never do me! can not accept to treat twice an object +// throw new EchoBaseTechnicalException( +// "Wanted to treat twice entity " + topiaId + +// "\n Current stack " + stack.toString()); +// +// } if (log.isDebugEnabled()) { log.debug("Starts export of entity " + topiaId); } @@ -165,7 +163,7 @@ @Override public void end(TopiaEntity entity) { - stack.pop(); +// stack.pop(); try { if (log.isDebugEnabled()) { log.debug("Starts export of association of entity " + @@ -204,17 +202,35 @@ if (CollectionUtils.isNotEmpty(cValue)) { - int i = 0; - for (Object currentValue : cValue) { - TopiaEntity currentEntity = (TopiaEntity) currentValue; - visit(entity, - propertyName, - type, - collectionType, - i++, - currentEntity - ); + if (Voyage.PROPERTY_POST_CELL.equals(propertyName) + && entity instanceof Voyage) { + // special case, when visiting cells from Voyage entity, + // let's not visit cells childs (they will be visited later + // by the DataProcessing himself) + for (Object currentValue : cValue) { + ((Cell) currentValue).acceptWithNoChilds(this); + } + } else { + int i = 0; + for (Object currentValue : cValue) { + TopiaEntity currentEntity = (TopiaEntity) currentValue; + try { + currentEntity.accept(this); + } catch (TopiaException e) { + if (log.isErrorEnabled()) { + log.error("Can not visit entity " + value, e); + } + } + visit(entity, + propertyName, + type, + collectionType, + i++, + currentEntity + ); + + } } } } @@ -226,13 +242,15 @@ Class<?> collectionType, Class<?> type, int index, Object value) { - try { - ((TopiaEntity) value).accept(this); - } catch (TopiaException e) { - if (log.isErrorEnabled()) { - log.error("Can not visit entity " + value, e); - } - } + + // not used here! +// try { +// ((TopiaEntity) value).accept(this); +// } catch (TopiaException e) { +// if (log.isErrorEnabled()) { +// log.error("Can not visit entity " + value, e); +// } +// } } @Override

1 0

r514 - trunk/echobase-services/src/main/java/fr/ifremer/echobase/services
by tchemit＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: tchemit Date: 2012-04-10 19:06:05 +0200 (Tue, 10 Apr 2012) New Revision: 514 Url: http://forge.codelutin.com/repositories/revision/echobase/514 Log: try to find out what is the export db problem... Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 17:05:13 UTC (rev 513) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ReplicateEntityVisitor.java 2012-04-10 17:06:05 UTC (rev 514) @@ -26,6 +26,7 @@ import com.google.common.base.Preconditions; import com.google.common.collect.Maps; import com.google.common.collect.Multimap; +import com.google.common.collect.Sets; import fr.ifremer.echobase.EchoBaseTechnicalException; import fr.ifremer.echobase.csv.EntityExportContext; import fr.ifremer.echobase.entities.EchoBaseEntityEnum; @@ -43,8 +44,11 @@ import org.nuiton.util.csv.ExportModel; import java.io.File; +import java.util.ArrayDeque; import java.util.Collection; +import java.util.Deque; import java.util.Map; +import java.util.Set; /** * entity visitor to export data to csv files. @@ -61,6 +65,10 @@ public static final TimeLog TIME_LOG = new TimeLog(ReplicateEntityVisitor.class); + protected Set<String> ids = Sets.newHashSetWithExpectedSize(2000000000); + + protected Deque<String> stack = new ArrayDeque<String>(); + public static ReplicateEntityVisitor createVisitor(ExportService service, MetaFilenameAware[] entityMetas, Multimap<EchoBaseEntityEnum, MetaFilenameAware> associations, @@ -127,9 +135,20 @@ @Override public void start(TopiaEntity entity) { + String topiaId = entity.getTopiaId(); try { + stack.push(topiaId); + boolean added = ids.add(topiaId); + if (!added) { + + // Never do me! can not accept to treat twice an object + throw new EchoBaseTechnicalException( + "Wanted to treat twice entity " + topiaId + + "\n Current stack " + stack.toString()); + + } if (log.isDebugEnabled()) { - log.debug("Starts export of entity " + entity.getTopiaId()); + log.debug("Starts export of entity " + topiaId); } EntityExportContext entityExporter = entityExporters.get(entity.getClass()); @@ -139,13 +158,14 @@ "Could not export entity " + entity, e); } finally { if (log.isDebugEnabled()) { - log.debug("Ends export of entity " + entity.getTopiaId()); + log.debug("Ends export of entity " + topiaId); } } } @Override public void end(TopiaEntity entity) { + stack.pop(); try { if (log.isDebugEnabled()) { log.debug("Starts export of association of entity " +

1 0

r513 - trunk/echobase-entities/src/main/xmi
by tchemit＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: tchemit Date: 2012-04-10 19:05:13 +0200 (Tue, 10 Apr 2012) New Revision: 513 Url: http://forge.codelutin.com/repositories/revision/echobase/513 Log: add unique on cells Modified: trunk/echobase-entities/src/main/xmi/echobase.properties Modified: trunk/echobase-entities/src/main/xmi/echobase.properties =================================================================== --- trunk/echobase-entities/src/main/xmi/echobase.properties 2012-04-10 14:33:12 UTC (rev 512) +++ trunk/echobase-entities/src/main/xmi/echobase.properties 2012-04-10 17:05:13 UTC (rev 513) @@ -48,6 +48,7 @@ ############################################################################### fr.ifremer.echobase.entities.data.Voyage.attribute.echotype.stereotype=unique +fr.ifremer.echobase.entities.data.Cell.attribute.cell.stereotype=unique ############################################################################### ### Big Text attributes #######################################################

1 0

r512 - in trunk/echobase-services/src/main: java/fr/ifremer/echobase/services/importdata java/fr/ifremer/echobase/services/importdata/csv resources/i18n
by tchemit＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: tchemit Date: 2012-04-10 16:33:12 +0200 (Tue, 10 Apr 2012) New Revision: 512 Url: http://forge.codelutin.com/repositories/revision/echobase/512 Log: improve import progression 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/AcousticImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 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 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AbstractImportDataService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -262,6 +262,27 @@ } } + protected String getImportMessage(InputFile inputFile) { + String message = l_(getLocale(), "echobase.importLabel.withFile", + getImportLabel(), inputFile.getFileName()); + return message; + } + + protected final void doFlushTransaction(int rowNumber, InputFile inputFile) { + if (rowNumber % 1000 == 0) { + // flush each 1000 imported rows + String message = getImportMessage(inputFile); + try { + long s0 = TimeLog.getTime(); + flushTransaction(); + TIME_LOG.log(s0, message); + } catch (TopiaException e) { + throw new EchoBaseTechnicalException( + "Could not flush transaction " + message, e); + } + } + } + protected Map<String, SpeciesCategory> speciesCategories = Maps.newTreeMap(); protected SpeciesCategory getSpeciesCategory( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/AcousticImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -150,8 +150,7 @@ InputFile inputFile = configuration.getMoviesFile(); if (log.isInfoEnabled()) { - log.info("Starts import of acoustic datas from file " + - inputFile.getFileName()); + log.info("Starts " + getImportMessage(inputFile)); } CsvFileImportResult importResult = new CsvFileImportResult( @@ -199,6 +198,8 @@ configuration.incrementsProgression(); for (AcousticImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); + configuration.incrementsProgression(); if (dataProcessingId == null) { @@ -210,7 +211,7 @@ } Date startDate = row.getCellDateStart(); - Date endDate = row.getCellDateEnd(); + Date endDate = row.getCellDateEnd(); // get transect to use Transit transit = voyage.getTransit(startDate); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/CatchesImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -194,9 +194,11 @@ Import<TotalSampleImportRow> importer = EchoBaseImport.newImport(csvModel, reader); + int rowNumber=0; configuration.incrementsProgression(); for (TotalSampleImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Operation operation = row.getOperation(); @@ -361,8 +363,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber=0; for (SubSampleImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Operation operation = row.getOperation(); @@ -477,8 +481,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber=0; for (BiometrySampleImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Operation operation = row.getOperation(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/OperationImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -161,9 +161,11 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber=0; for (OperationImportRow row : importer) { configuration.incrementsProgression(); + doFlushTransaction(++rowNumber, inputFile); Vessel vessel = row.getVessel(); Operation operation = row.getOperation(); @@ -224,9 +226,11 @@ Import<OperationMetadataValueImportRow> importer = EchoBaseImport.newImport(csvModel, reader); + int rowNumber=0; configuration.incrementsProgression(); for (OperationMetadataValueImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Operation operation = row.getOperation(); @@ -281,9 +285,11 @@ Import<GearMetadataValueImportRow> importer = EchoBaseImport.newImport(csvModel, reader); + int rowNumber=0; configuration.incrementsProgression(); for (GearMetadataValueImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Operation operation = row.getOperation(); 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-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsEsduCellImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -242,8 +242,11 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber = 0; + for (EsduResultByEchotypeImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = row.getCell(); @@ -320,8 +323,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber = 0; for (EsduResultByEchotypeAndSpeciesCategoryImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = row.getCell(); @@ -401,8 +406,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber = 0; for (EsduResultBySpeciesAndSizeCategoryImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = row.getCell(); @@ -502,8 +509,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber = 0; for (EsduResultBySpeciesAndAgeCategoryImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = row.getCell(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsMapCellImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -191,8 +191,10 @@ configuration.incrementsProgression(); + int rowNumber=0; for (MapCellImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = create(dao, row.getCell()); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsRegionCellImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -166,9 +166,13 @@ Cell cell = null; configuration.incrementsProgression(); + int rowNumber = 0; for (RegionCellImportRow row : importer) { configuration.incrementsProgression(); + rowNumber++; + doFlushTransaction(rowNumber, inputFile); + if (cell == null || !row.getName().equals(cell.getName())) { cell = create(dao, @@ -240,8 +244,11 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber=0; for (RegionCellAssociationImportRow row : importer) { + rowNumber++; + doFlushTransaction(rowNumber, inputFile); configuration.incrementsProgression(); Cell regionCell = row.getRegionCell(); @@ -328,8 +335,11 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber=0; for (RegionCellResultImportRow row : importer) { + rowNumber++; + doFlushTransaction(rowNumber, inputFile); configuration.incrementsProgression(); Cell cell = row.getCell(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/ResultsVoyageImportService.java 2012-04-10 14:33:12 UTC (rev 512) @@ -182,8 +182,10 @@ EchoBaseImport.newImport(csvModel, reader); configuration.incrementsProgression(); + int rowNumber = 0; for (LengthWeightKeyImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Voyage voyage = row.getVoyage(); @@ -249,8 +251,10 @@ configuration.incrementsProgression(); + int rowNumber = 0; for (LengthAgeKeyImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Voyage voyage = row.getVoyage(); @@ -304,8 +308,10 @@ configuration.incrementsProgression(); + int rowNumber = 0; for (EchotypeImportRow row : importer) { + doFlushTransaction(++rowNumber, inputFile); configuration.incrementsProgression(); Voyage voyage = row.getVoyage(); Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeAndSpeciesCategoryImportModel.java 2012-04-10 14:33:12 UTC (rev 512) @@ -50,7 +50,8 @@ Species.PROPERTY_BARACOUDA_CODE, EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_SIZE_CATEGORY, EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_ECHOTYPE, - EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_DATA_QUALITY + EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_DATA_QUALITY, + EsduResultByEchotypeAndSpeciesCategoryImportRow.PROPERTY_VOYAGE }; public EsduResultByEchotypeAndSpeciesCategoryImportModel( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultByEchotypeImportModel.java 2012-04-10 14:33:12 UTC (rev 512) @@ -46,7 +46,8 @@ public static final String[] COLUMN_NAMES_TO_EXCLUDE = { CELL_NAME, EsduResultByEchotypeImportRow.PROPERTY_ECHOTYPE, - EsduResultByEchotypeImportRow.PROPERTY_DATA_QUALITY + EsduResultByEchotypeImportRow.PROPERTY_DATA_QUALITY, + EsduResultByEchotypeImportRow.PROPERTY_VOYAGE }; public EsduResultByEchotypeImportModel( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndAgeCategoryImportModel.java 2012-04-10 14:33:12 UTC (rev 512) @@ -48,7 +48,8 @@ Species.PROPERTY_BARACOUDA_CODE, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY, EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_AGE_CATEGORY_MEANING, - EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_DATA_QUALITY + EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_DATA_QUALITY, + EsduResultBySpeciesAndAgeCategoryImportRow.PROPERTY_VOYAGE }; public EsduResultBySpeciesAndAgeCategoryImportModel( Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/importdata/csv/EsduResultBySpeciesAndSizeCategoryImportModel.java 2012-04-10 14:33:12 UTC (rev 512) @@ -48,7 +48,8 @@ Species.PROPERTY_BARACOUDA_CODE, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY, EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_SIZE_CATEGORY_MEANING, - EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_DATA_QUALITY + EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_DATA_QUALITY, + EsduResultBySpeciesAndSizeCategoryImportRow.PROPERTY_VOYAGE }; public EsduResultBySpeciesAndSizeCategoryImportModel( Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_en_GB.properties 2012-04-10 14:33:12 UTC (rev 512) @@ -43,6 +43,7 @@ echobase.importError.no.voyage.imported= echobase.importError.transect.notfound= echobase.importError.transit.notfound= +echobase.importLabel.withFile=%s with file %s echobase.info.modifiedProperty=Property '%s', old value\: '%s', new value\: '%s' echobase.info.onePropertyModified=One property was modified\: echobase.info.somePropertiesModified=%s properties were modified\: Modified: trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties =================================================================== --- trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-04-10 08:41:08 UTC (rev 511) +++ trunk/echobase-services/src/main/resources/i18n/echobase-services_fr_FR.properties 2012-04-10 14:33:12 UTC (rev 512) @@ -43,6 +43,7 @@ echobase.importError.no.voyage.imported=Aucun voyage importé echobase.importError.transect.notfound=Transit non trouvé pour la campagne %s et la date %s et le navire %s (ligne %s) echobase.importError.transit.notfound=Transit non trouvé pour la campagne %s et la date %s (ligne %s) +echobase.importLabel.withFile=%s avec le fichier %s echobase.info.modifiedProperty=Propriété '%s', ancienne valeur \: '%s', nouvelle valeur \: '%s' echobase.info.newEntityCreated=Une nouvelle entité a été créée %s echobase.info.onePropertyModified=Une propriété a été modifiée \:

1 0

r511 - trunk/echobase-services/src/main/resources/embedded
by tchemit＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: tchemit Date: 2012-04-10 10:41:08 +0200 (Tue, 10 Apr 2012) New Revision: 511 Url: http://forge.codelutin.com/repositories/revision/echobase/511 Log: fix embedded configuration Modified: trunk/echobase-services/src/main/resources/embedded/echobase.properties Modified: trunk/echobase-services/src/main/resources/embedded/echobase.properties =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-04-10 08:27:03 UTC (rev 510) +++ trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-04-10 08:41:08 UTC (rev 511) @@ -33,3 +33,10 @@ # where to find war war.directory=${data.directory} + +# Database configuration +hibernate.dialect=org.hibernate.dialect.H2Dialect +hibernate.connection.driver_class=org.h2.Driver +hibernate.connection.username=sa +hibernate.connection.password=sa +hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase

1 0

r510 - trunk/echobase-ui/src/main/resources/i18n
by tchemit＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: tchemit Date: 2012-04-10 10:27:03 +0200 (Tue, 10 Apr 2012) New Revision: 510 Url: http://forge.codelutin.com/repositories/revision/echobase/510 Log: i18n Modified: trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 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-04-10 08:26:30 UTC (rev 509) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_en_GB.properties 2012-04-10 08:27:03 UTC (rev 510) @@ -4,6 +4,7 @@ echobase.action.newLibreOfficeQuery=New Libre office request echobase.action.newQuery=New request echobase.action.saveSqlQuery=Update query +echobase.action.show.import.documentation=Show import documentation echobase.action.toEnglish=Use english version echobase.action.toFrench=Use the french version echobase.action.usingEnglish=English version used @@ -58,4 +59,3 @@ echobase.title.confirm.deleteQuery=Delete a export query echobase.title.dbEditor.read=Visualisation des données echobase.title.newLibreOfficeQuery=Import a new "Libre-Office" request -echobase.action.show.import.documentation=Show import documentation 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-04-10 08:26:30 UTC (rev 509) +++ trunk/echobase-ui/src/main/resources/i18n/echobase-ui_fr_FR.properties 2012-04-10 08:27:03 UTC (rev 510) @@ -29,6 +29,7 @@ echobase.action.return=Retour echobase.action.save=Sauvegarder echobase.action.saveSqlQuery=Mettre à jour +echobase.action.show.import.documentation=Accéder à la documentation de l'import echobase.action.toEnglish=Utiliser la version anglaise echobase.action.toFrench=Utiliser la version française echobase.action.usingEnglish=Version anglaise utilisé @@ -264,4 +265,3 @@ echobase.title.newLibreOfficeQuery=Importer une requète Libre-office echobase.title.users=Adminitration des utilisateurs echobase.title.welcome=Bienvenue dans EchoBase -echobase.action.show.import.documentation=Accéder à la documentation de l'import

1 0