Author: echatellier Date: 2012-03-26 16:15:38 +0200 (Mon, 26 Mar 2012) New Revision: 991 Url: http://forge.codelutin.com/repositories/revision/coser/991 Log: fixes #1026 : Ajouter le fichier reftaxSpecies.csv dans le fichier zip de t?\195?\169l?\195?\169chargement des sources Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java =================================================================== --- trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-03-01 11:22:35 UTC (rev 990) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2012-03-26 14:15:38 UTC (rev 991) @@ -2121,6 +2121,12 @@ } FileUtils.copyFile(dechargePDF, new File(archiveDir, filename)); + // ajout du reftax dans le zip + File projectsDirectory = config.getWebIndicatorsProjectsDirectory(); + File projectDirectory = new File(projectsDirectory, project.getName()); + File reftaxFile = new File(projectDirectory, CoserConstants.Category.REFTAX_SPECIES.getStorageFileName()); + FileUtils.copyFileToDirectory(reftaxFile, archiveDir); + // make zip resultZip = File.createTempFile("coserresultzip-", ".zip"); resultZip.deleteOnExit(); @@ -2131,7 +2137,7 @@ } catch (IOException ex) { throw new CoserBusinessException("Can't create zip file", ex); } - + return resultZip; } Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2012-03-01 11:22:35 UTC (rev 990) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2012-03-26 14:15:38 UTC (rev 991) @@ -191,6 +191,8 @@ tempDir = FileUtil.createTempDirectory("coser", ".tmp"); ZipUtil.uncompress(zip, tempDir); Assert.assertTrue(new File(tempDir, "RSUFI_DATA_projet1" + File.separator + "DechargeDonnees.pdf").isFile()); + // test que le reftax est dans le zip + Assert.assertTrue(new File(tempDir, "RSUFI_DATA_projet1" + File.separator + "reftaxSpecies.csv").isFile()); FileUtils.deleteDirectory(tempDir); }