Author: tchemit Date: 2013-12-08 08:23:27 +0100 (Sun, 08 Dec 2013) New Revision: 1433 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1433 Log: refs #3624: [Rapport] Int?\195?\169gration de rapports g?\195?\169n?\195?\169r?\195?\169s par Birt (reports works) Modified: trunk/tutti-service/ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java Property changes on: trunk/tutti-service ___________________________________________________________________ Modified: svn:ignore - target .idea *.ipr *.iws *.iml + target .idea *.ipr *.iws *.iml *.log Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-05 17:37:15 UTC (rev 1432) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/report/ReportService.java 2013-12-08 07:23:27 UTC (rev 1433) @@ -37,7 +37,6 @@ import org.eclipse.birt.core.framework.Platform; import org.eclipse.birt.report.engine.api.EngineConfig; import org.eclipse.birt.report.engine.api.EngineConstants; -import org.eclipse.birt.report.engine.api.EngineException; import org.eclipse.birt.report.engine.api.IRenderOption; import org.eclipse.birt.report.engine.api.IReportEngine; import org.eclipse.birt.report.engine.api.IReportEngineFactory; @@ -130,8 +129,21 @@ context.getConfig().getTmpDirectory(), model.getInputFile(), "Could not explode data zip file"); + // get all directories of exploded archive + File[] directories = dataDirectory.listFiles(new FileFilter() { + @Override + public boolean accept(File pathname) { + return pathname.isDirectory(); + } + }); + // should have a unique directory + Preconditions.checkState(directories.length == 1, + "Archive should contains a unique directory"); + dataDirectory = directories[0]; + if (log.isInfoEnabled()) { - log.info("Will generate report using report " + model.getReport().getName()); + log.info("Will generate report using report " + + model.getReport().getName()); } IReportEngine engine = factory.createReportEngine(engineConfig); @@ -145,9 +157,6 @@ // Report context Map<String, Object> context = Maps.newHashMap(); context.put(EngineConstants.APPCONTEXT_CHART_RESOLUTION, RENDER_DPI); - context.put("rpt-param_dirfile", dataDirectory.getAbsolutePath()); - context.put("rpt-param_codestation", model.getFishingOperation().getStationNumber()); - context.put("rpt-param_numerotrait", model.getFishingOperation().getFishingOperationNumber()); /** * rpt-param_dirfile : répertoire contant les fichiers @@ -164,6 +173,9 @@ IRunAndRenderTask task = engine.createRunAndRenderTask(rptDoc); task.setRenderOption(renderOption); task.setAppContext(context); + task.setParameterValue("rpt-param_dirfile", dataDirectory.getAbsolutePath()); + task.setParameterValue("rpt-param_codestation", model.getFishingOperation().getStationNumber()); + task.setParameterValue("rpt-param_numerotrait", model.getFishingOperation().getFishingOperationNumber()); // render task.run(); Modified: trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java =================================================================== --- trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2013-12-05 17:37:15 UTC (rev 1432) +++ trunk/tutti-service/src/test/java/fr/ifremer/tutti/service/report/ReportServiceTest.java 2013-12-08 07:23:27 UTC (rev 1433) @@ -1,7 +1,6 @@ package fr.ifremer.tutti.service.report; import fr.ifremer.shared.application.ApplicationIOUtil; -import fr.ifremer.shared.application.ApplicationTechnicalException; import fr.ifremer.tutti.persistence.ProgressionModel; import fr.ifremer.tutti.persistence.entities.data.FishingOperation; import fr.ifremer.tutti.service.ServiceDbResource; @@ -57,8 +56,7 @@ } - // remove exception when it will work - @Test(expected = ApplicationTechnicalException.class) + @Test public void testGenerateReport() throws Exception { // export campaign data