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

r525 - trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders
by tchemit＠users.forge.codelutin.com 11 Apr '12

11 Apr '12

Author: tchemit Date: 2012-04-11 14:04:24 +0200 (Wed, 11 Apr 2012) New Revision: 525 Url: http://forge.codelutin.com/repositories/revision/echobase/525 Log: correction utilisation dataMetadata Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java 2012-04-10 22:22:38 UTC (rev 524) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/CellLoader.java 2012-04-11 12:04:24 UTC (rev 525) @@ -299,6 +299,11 @@ String campagne = (String) eiconfigurationRow.get("CAMPAGNE"); String longName = campagne + "_" + unitSource; + if ("Sa".equals(unitSource)) { + longName ="Nautical area scattering coefficient"; + } else if ("m2.mV2".equals(unitSource)) { + longName ="Electrical energy received by the acoustic transceiver"; + } DataMetadata acousticMetadata = dataMetadataDAO.findByLongName(longName); Preconditions.checkNotNull(acousticMetadata, "Could not find acoustic Metadata with name " + longName);

1 0

r524 - in trunk: . echobase-entities echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: maven-release Date: 2012-04-11 00:22:38 +0200 (Wed, 11 Apr 2012) New Revision: 524 Url: http://forge.codelutin.com/repositories/revision/echobase/524 Log: [maven-release-plugin] prepare for next development iteration Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-10 22:22:31 UTC (rev 523) +++ trunk/echobase-entities/pom.xml 2012-04-10 22:22:38 UTC (rev 524) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.6</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-10 22:22:31 UTC (rev 523) +++ trunk/echobase-services/pom.xml 2012-04-10 22:22:38 UTC (rev 524) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.6</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-04-10 22:22:31 UTC (rev 523) +++ trunk/echobase-tools/pom.xml 2012-04-10 22:22:38 UTC (rev 524) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.6</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-10 22:22:31 UTC (rev 523) +++ trunk/echobase-ui/pom.xml 2012-04-10 22:22:38 UTC (rev 524) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.6</version> + <version>1.0-SNAPSHOT</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-10 22:22:31 UTC (rev 523) +++ trunk/pom.xml 2012-04-10 22:22:38 UTC (rev 524) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.6</version> + <version>1.0-SNAPSHOT</version> <modules> <module>echobase-entities</module> @@ -79,12 +79,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.6</url> + <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.6 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.6 + scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk </developerConnection> </scm>

1 0

r523 - tags
by maven-release＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: maven-release Date: 2012-04-11 00:22:31 +0200 (Wed, 11 Apr 2012) New Revision: 523 Url: http://forge.codelutin.com/repositories/revision/echobase/523 Log: [maven-release-plugin] copy for tag echobase-0.6 Added: tags/echobase-0.6/

1 0

r522 - in trunk: . echobase-entities echobase-services echobase-tools echobase-ui
by maven-release＠users.forge.codelutin.com 10 Apr '12

10 Apr '12

Author: maven-release Date: 2012-04-11 00:22:24 +0200 (Wed, 11 Apr 2012) New Revision: 522 Url: http://forge.codelutin.com/repositories/revision/echobase/522 Log: [maven-release-plugin] prepare release echobase-0.6 Modified: trunk/echobase-entities/pom.xml trunk/echobase-services/pom.xml trunk/echobase-tools/pom.xml trunk/echobase-ui/pom.xml trunk/pom.xml Modified: trunk/echobase-entities/pom.xml =================================================================== --- trunk/echobase-entities/pom.xml 2012-04-10 22:20:08 UTC (rev 521) +++ trunk/echobase-entities/pom.xml 2012-04-10 22:22:24 UTC (rev 522) @@ -9,7 +9,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-services/pom.xml =================================================================== --- trunk/echobase-services/pom.xml 2012-04-10 22:20:08 UTC (rev 521) +++ trunk/echobase-services/pom.xml 2012-04-10 22:22:24 UTC (rev 522) @@ -10,7 +10,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-tools/pom.xml =================================================================== --- trunk/echobase-tools/pom.xml 2012-04-10 22:20:08 UTC (rev 521) +++ trunk/echobase-tools/pom.xml 2012-04-10 22:22:24 UTC (rev 522) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-10 22:20:08 UTC (rev 521) +++ trunk/echobase-ui/pom.xml 2012-04-10 22:22:24 UTC (rev 522) @@ -11,7 +11,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> </parent> <groupId>fr.ifremer.echobase</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2012-04-10 22:20:08 UTC (rev 521) +++ trunk/pom.xml 2012-04-10 22:22:24 UTC (rev 522) @@ -15,7 +15,7 @@ <groupId>fr.ifremer</groupId> <artifactId>echobase</artifactId> - <version>0.6-SNAPSHOT</version> + <version>0.6</version> <modules> <module>echobase-entities</module> @@ -79,12 +79,12 @@  <scm> - <url>http://svn.forge.codelutin.com/svn/echobase/trunk</url> + <url>http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.6</url> <connection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.6 </connection> <developerConnection> - scm:svn:http://svn.forge.codelutin.com/svn/echobase/trunk + scm:svn:http://svn.forge.codelutin.com/svn/echobase/tags/echobase-0.6 </developerConnection> </scm>

1 0

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

10 Apr '12

Author: tchemit Date: 2012-04-11 00:20:08 +0200 (Wed, 11 Apr 2012) New Revision: 521 Url: http://forge.codelutin.com/repositories/revision/echobase/521 Log: optimize dependencies Modified: trunk/echobase-ui/pom.xml trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/ConnectToDbInformations.java Modified: trunk/echobase-ui/pom.xml =================================================================== --- trunk/echobase-ui/pom.xml 2012-04-10 22:12:59 UTC (rev 520) +++ trunk/echobase-ui/pom.xml 2012-04-10 22:20:08 UTC (rev 521) @@ -112,6 +112,11 @@ <scope>runtime</scope> </dependency> + <dependency> + <groupId>org.hibernate</groupId> + <artifactId>hibernate-core</artifactId> + </dependency> +  <dependency> Modified: trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/ConnectToDbInformations.java =================================================================== --- trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/ConnectToDbInformations.java 2012-04-10 22:12:59 UTC (rev 520) +++ trunk/echobase-ui/src/main/java/fr/ifremer/echobase/ui/actions/user/ConnectToDbInformations.java 2012-04-10 22:20:08 UTC (rev 521) @@ -26,7 +26,7 @@ import fr.ifremer.echobase.EchoBaseConfiguration; import fr.ifremer.echobase.services.EmbeddedApplicationService; import fr.ifremer.echobase.ui.actions.EchoBaseActionSupport; -import org.apache.commons.lang.StringUtils; +import org.apache.commons.lang3.StringUtils; import org.nuiton.topia.TopiaContextFactory; import java.io.File;

1 0

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

10 Apr '12

Author: tchemit Date: 2012-04-11 00:12:59 +0200 (Wed, 11 Apr 2012) New Revision: 520 Url: http://forge.codelutin.com/repositories/revision/echobase/520 Log: fixes #1094: Passer la base embarqu?\195?\169 en mode serveur Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java trunk/echobase-services/src/main/resources/embedded/echobase.properties trunk/src/doc/reunions/reunion-2012-04-06.txt Modified: trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java =================================================================== --- trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-04-10 20:46:01 UTC (rev 519) +++ trunk/echobase-entities/src/main/java/fr/ifremer/echobase/EchoBaseTopiaRootContextFactory.java 2012-04-10 22:12:59 UTC (rev 520) @@ -75,7 +75,8 @@ } finally { Closeables.closeQuietly(input); } - String dbUrl = "jdbc:h2:file:" + databaseAbsolutePath + "/echobase;CACHE_SIZE=65536"; + String dbUrl = "jdbc:h2:file:" + databaseAbsolutePath + + "/echobase;LOG=0;CACHE_SIZE=65536;LOCK_MODE=0;UNDO_LOG=0"; properties.setProperty(TopiaContextFactory.CONFIG_URL, dbUrl); if (log.isInfoEnabled()) { Modified: trunk/echobase-services/src/main/resources/embedded/echobase.properties =================================================================== --- trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-04-10 20:46:01 UTC (rev 519) +++ trunk/echobase-services/src/main/resources/embedded/echobase.properties 2012-04-10 22:12:59 UTC (rev 520) @@ -39,4 +39,4 @@ 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 +hibernate.connection.url=jdbc:h2:file:${data.directory}/db/echobase;CACHE_SIZE=65536;AUTO_SERVER=TRUE Modified: trunk/src/doc/reunions/reunion-2012-04-06.txt =================================================================== --- trunk/src/doc/reunions/reunion-2012-04-06.txt 2012-04-10 20:46:01 UTC (rev 519) +++ trunk/src/doc/reunions/reunion-2012-04-06.txt 2012-04-10 22:12:59 UTC (rev 520) @@ -9,18 +9,16 @@ ------- - uniformiser format date - heure en utilisant uniquement le format yyyy-MM-dd HH:mm:ss.SSSS (#1091) (done) -- mettre en place la doc en ligne pour que Mathieu puisse faire la documentation des imports. (#1092) -- mettre en place le lien sur les imports qui bascule sur la documentation (#1092) -- mettre un label sur import resultat voyage (pour indiquer qu'il faut au moins) - un fichier resultat - voyage / resultat esdu - pêche) (#1087) (done) -- rendre optionnel sur import pêche les fichiers (il en faut au moins un) (#1087) -- import sub-sample utiliser les colonnes units et round pour afiner le SampleDataType voir procédure (#1098) +- mettre en place la doc en ligne pour que Mathieu puisse faire la documentation des imports. (#1092) (done) +- mettre en place le lien sur les imports qui bascule sur la documentation (#1092) done) +- mettre un label sur import resultat voyage (pour indiquer qu'il faut au moins) un fichier resultat - voyage / resultat esdu - pêche) (#1087) (done) +- rendre optionnel sur import pêche les fichiers (il en faut au moins un) (#1087) (done) +- import sub-sample utiliser les colonnes units et round pour afiner le SampleDataType voir procédure (#1098) (done) - LenghtWeightKey ajouter strata comme pour lengthAgeKey et pour l'import faire de même (pense aussi à impacter les données legacy) (#1093) (done) - changer l'ordre des imports résultats (#1087) (done) - mettre le style en dynamique (width:100% et plus en auto) (done) - améliorer l'écran des infos de connexion (ajouter le driver à utiliser) (#484) (done) -- passer sur la base embarquée en mode serveur (sinon il faut arrêter le - serveur pour aller dans libre-office :(). (#1094) +- passer sur la base embarquée en mode serveur (sinon il faut arrêter le serveur pour aller dans libre-office :(). (#1094) - vérifier que les echotypes sont uniques au sein d'un même voyage (revoir sql import historique) (#1087) - ajouter la colonne voyage sur tous les imports de resultats esdu (#1096) (done) - ajouter une configuration pour changer l'image de fond de l'application (Bonus)

1 0

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