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