Author: tchemit Date: 2011-12-27 15:40:26 +0100 (Tue, 27 Dec 2011) New Revision: 224 Url: http://forge.codelutin.com/repositories/revision/echobase/224 Log: recomment test code Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java Modified: trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java =================================================================== --- trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2011-12-27 14:39:35 UTC (rev 223) +++ trunk/echobase-services/src/main/java/fr/ifremer/echobase/services/ExportService.java 2011-12-27 14:40:26 UTC (rev 224) @@ -32,13 +32,11 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.nuiton.topia.persistence.TopiaEntity; -import org.nuiton.topia.persistence.util.EntityOperator; import org.nuiton.util.TimeLog; import org.nuiton.util.csv.Export; import org.nuiton.util.csv.ExportModel; import java.io.File; -import java.util.Iterator; import java.util.List; /** @@ -120,7 +118,7 @@ } long s1 = TimeLog.getTime(); Export<TopiaEntity> export = prepareExport(associationMeta); - timeLog.log(s1, "prepareExport"); + timeLog.log(s1, "exportDatas::prepareExport"); long s2 = TimeLog.getTime(); try { @@ -128,7 +126,7 @@ } catch (Exception eee) { throw new EchoBaseTechnicalException("Can not export datas", eee); } - timeLog.log(s2, "exportToFile"); + timeLog.log(s2, "exportDatas::exportToFile"); } protected Export<TopiaEntity> prepareExport(TableMeta tableMeta) { @@ -144,21 +142,21 @@ DbEditorService service = getService(DbEditorService.class); TableMeta tableMeta = service.getTableMeta(associationMeta.getSource()); - long s0 = TimeLog.getTime(); -// List<TopiaEntity> datas = service.getEntities(tableMeta, null, null, null, "size(e." + associationMeta.getName() + ") > 0"); - List<TopiaEntity> datas = service.getEntities(tableMeta, null, null, null, null); - timeLog.log(s0, "prepareExport::getEntities"); - s0 = TimeLog.getTime(); - EntityOperator<TopiaEntity> operator = associationMeta.getOperator(); - Iterator<TopiaEntity> itr = datas.iterator(); - while (itr.hasNext()) { - TopiaEntity entity = itr.next(); - int size = operator.sizeChild(associationMeta.getName(), entity); - if (size == 0) { - itr.remove(); - } - } - timeLog.log(s0, "prepareExport::removeEmptyChilds"); +// long s0 = TimeLog.getTime(); + List<TopiaEntity> datas = service.getEntities(tableMeta, null, null, null, "size(e." + associationMeta.getName() + ") > 0"); +// List<TopiaEntity> datas = service.getEntities(tableMeta, null, null, null, null); +// timeLog.log(s0, "prepareExport::getEntities"); +// s0 = TimeLog.getTime(); +// EntityOperator<TopiaEntity> operator = associationMeta.getOperator(); +// Iterator<TopiaEntity> itr = datas.iterator(); +// while (itr.hasNext()) { +// TopiaEntity entity = itr.next(); +// int size = operator.sizeChild(associationMeta.getName(), entity); +// if (size == 0) { +// itr.remove(); +// } +// } +// timeLog.log(s0, "prepareExport::removeEmptyChilds"); ExportModel<TopiaEntity> model = buildForExport(associationMeta); return Export.newExport(model, datas); }