Author: tchemit Date: 2012-09-12 13:02:33 +0200 (Wed, 12 Sep 2012) New Revision: 651 Url: http://forge.codelutin.com/repositories/revision/echobase/651 Log: remove comment code Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbService.java 2012-09-11 16:59:23 UTC (rev 650) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/exportdb/ExportDbService.java 2012-09-12 11:02:33 UTC (rev 651) @@ -94,206 +94,5 @@ strategy.doExport(model, dir); EchoBaseIOUtil.compressZipFile(zipFile, dir); - } - -// /** -// * Export the complete db into csv files stored in a zip archive file. -// * -// * @param model file name of the zip to create -// * @throws IOException if could not create or write files. -// */ -// public void exportDb(ExportDbConfiguration model) throws IOException { -// -// String fileName = model.getFileName(); -// -// File tempDirectory = model.getWorkingDirectory(); -// -// File zipFile = new File(tempDirectory, fileName + ".zip"); -// -// if (log.isInfoEnabled()) { -// log.info("Will export db to " + zipFile); -// } -// model.setExportFile(zipFile); -// -// ExportService exportService = getService(ExportService.class); -// File dir = new File(tempDirectory, "echobase"); -// -// FileUtil.createDirectoryIfNecessary(dir); -// -// EchoBaseDbMeta dbMeta = getDbMeta(); -// -// model.setNbSteps(dbMeta.getEntriesSize()); -// -// for (TableMeta<EchoBaseEntityEnum> meta : dbMeta.getAllTables()) { -// -// model.incrementsProgression(); -// -// exportService.exportData(meta, new File(dir, meta.getFilename())); -// } -// -// for (AssociationMeta<EchoBaseEntityEnum> meta : dbMeta.getAllAssociations()) { -// -// model.incrementsProgression(); -// -// exportService.exportData(meta, new File(dir, meta.getFilename())); -// } -// if (log.isInfoEnabled()) { -// log.info("Export zip file = " + zipFile); -// } -// EchoBaseIOUtil.compressZipFile(zipFile, dir); -// } - -// /** -// * Export the partial db into csv files at the given location. -// * -// * @param model file name of the zip to create -// * @param computeSteps flag to compute stesp inside this method -// * @throws IOException if could not create or write files. -// */ -// public void exportPartialDb(ExportDbConfiguration model, -// boolean computeSteps) throws IOException { -// -// String fileName = model.getFileName(); -// -// File tempDirectory = model.getWorkingDirectory(); -// File dir = new File(tempDirectory, "echobase"); -// FileUtil.createDirectoryIfNecessary(dir); -// -// if (log.isInfoEnabled()) { -// log.info("Will export to " + dir); -// } -// -// File zipFile = new File(tempDirectory, fileName + ".zip"); -// model.setExportFile(zipFile); -// -// ExportService exportService = getService(ExportService.class); -// -// // export all referentiel -// List<TableMeta<EchoBaseEntityEnum>> refEntries = getDbMeta().getReferenceTables(); -// List<AssociationMeta<EchoBaseEntityEnum>> refAssocEntries = getDbMeta().getReferenceAssociations(); -// -// boolean withVoyages = model.getVoyageIds() != null; -// -// if (computeSteps) { -// int nbstesp = refEntries.size(); -// -// if (withVoyages) { -// nbstesp += model.getVoyageIds().length; -// } -// -// model.setNbSteps(nbstesp); -// } -// -// for (TableMeta<EchoBaseEntityEnum> meta : refEntries) { -// -// model.incrementsProgression(); -// -// File entryFile = new File(dir, meta.getFilename()); -// exportService.exportData(meta, entryFile); -// } -// -// for (AssociationMeta<EchoBaseEntityEnum> associationMeta : refAssocEntries) { -// -// model.incrementsProgression(); -// -// File entryFile = new File(dir, associationMeta.getFilename()); -// exportService.exportData(associationMeta, entryFile); -// } -// -// if (withVoyages) { -// List<TableMeta<EchoBaseEntityEnum>> dataEntries = -// getDbMeta().getDataTables(); -// List<AssociationMeta<EchoBaseEntityEnum>> dataAssociationEntries = -// getDbMeta().getDataAssociations(); -// -// ReplicateEntityVisitor visitor = createVisitor( -// exportService.getModelFactory(false), -// dataEntries, -// dataAssociationEntries, -// dir -// ); -// -// try { -// for (String voyageId : model.getVoyageIds()) { -// -// model.incrementsProgression(); -// -// Voyage voyage = getEntityById(Voyage.class, voyageId); -// visitor.export(voyage); -// } -// } finally { -// // close visitor to close export files -// visitor.close(); -// } -// } -// -// EchoBaseIOUtil.compressZipFile(zipFile, dir); -// } -// -// public ReplicateEntityVisitor createVisitor(ExportModelFactory<EchoBaseEntityEnum> modelFactory, -// List<TableMeta<EchoBaseEntityEnum>> entityMetas, -// List<AssociationMeta<EchoBaseEntityEnum>> associations, -// File container) { -// -// Preconditions.checkNotNull(modelFactory); -// -// Map<EchoBaseEntityEnum, TopiaCsvExports.EntityExportContext<EchoBaseEntityEnum>> contexts = TopiaCsvExports.createReplicateEntityVisitorContexts( -// modelFactory, entityMetas, associations, container); -// -// ReplicateEntityVisitor result = new ReplicateEntityVisitor( -// getDbMeta().getPersistenceHelper(), contexts); -// return result; -// } -// -// /** -// * entity visitor to export data to csv files. -// * -// * @author tchemit <chemit@codelutin.com> -// * @since 0.3 -// */ -// public static class ReplicateEntityVisitor extends ExportEntityVisitor<EchoBaseEntityEnum> { -// -// protected final Set<String> categoryIds; -// -// @Override -// protected boolean isNoChildVisit(String propertyName, TopiaEntity entity) { -// return Result.PROPERTY_CATEGORY.equals(propertyName) && -// entity instanceof Result; -// } -// -// public ReplicateEntityVisitor(TopiaPersistenceHelper<EchoBaseEntityEnum> typeProvider, -// Map<EchoBaseEntityEnum, TopiaCsvExports.EntityExportContext<EchoBaseEntityEnum>> entityExporters) { -// super(typeProvider, entityExporters); -// categoryIds = Sets.newHashSet(); -// } -// -// @Override -// public void visit(TopiaEntity entity, String propertyName, -// Class<?> type, Object value) { -// 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 -// public void close() throws IOException { -// categoryIds.clear(); -// super.close(); -// } -// } }