Author: tchemit Date: 2012-04-13 13:58:28 +0200 (Fri, 13 Apr 2012) New Revision: 538 Url: http://forge.codelutin.com/repositories/revision/echobase/538 Log: refs #1107: pb cr?\195?\169ation base embarqu?\195?\169e avec donn?\195?\169es Pelgas2000 ?\195?\160 2010 (ajout des associations echotype-species) Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java Modified: trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java =================================================================== --- trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java 2012-04-13 10:37:05 UTC (rev 537) +++ trunk/echobase-tools/src/main/java/fr/ifremer/echobase/tools/loaders/VoyageLoader.java 2012-04-13 11:58:28 UTC (rev 538) @@ -150,10 +150,14 @@ echotypeCategorys ); - TableMeta meta = getTable(EchoBaseEntityEnum.Echotype); - AssociationMeta associationMeta = + TableMeta echotypeMeta = getTable(EchoBaseEntityEnum.Echotype); + + AssociationMeta voyageEchotypeAssociationMeta = getMeta().getAssociations(Voyage.PROPERTY_ECHOTYPE); + AssociationMeta echotypeSpeciesAssociationMeta = + echotypeMeta.getAssociations(Echotype.PROPERTY_SPECIES); + DbEditorService dbEditorService = getService(DbEditorService.class); @@ -178,7 +182,7 @@ if (topiaId == null) { // create this new echotype - dbEditorService.saveEntity(meta, + dbEditorService.saveEntity(echotypeMeta, "", entity, null, @@ -210,12 +214,19 @@ File out; // Export echotypes - out = getTableFile(outputDir, meta, FileType.NEW); - getExportService().exportDatas(meta, out); + out = getTableFile(outputDir, echotypeMeta, FileType.NEW); + getExportService().exportDatas(echotypeMeta, out); + // Export echotype - species association + + out = getTableFile(outputDir, echotypeSpeciesAssociationMeta, FileType.ASSOCIATION); + getExportService().exportDatas(echotypeSpeciesAssociationMeta, out); + // Export voyage - echotype association - out = getTableFile(outputDir, associationMeta, FileType.ASSOCIATION); - getExportService().exportDatas(associationMeta, out); + out = getTableFile(outputDir, voyageEchotypeAssociationMeta, FileType.ASSOCIATION); + getExportService().exportDatas(voyageEchotypeAssociationMeta, out); + + } finally { if (cleanTransaction) { serviceContext.getTransaction().rollbackTransaction();