Author: chatellier Date: 2011-01-26 15:10:40 +0000 (Wed, 26 Jan 2011) New Revision: 587 Log: Fix dataAllowed condition. Fix meta file name in zip. 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 2011-01-26 15:09:45 UTC (rev 586) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-26 15:10:40 UTC (rev 587) @@ -1634,7 +1634,8 @@ baseDir.mkdirs(); File csvFile = publicationService.getRsufiResultComChartData(resultDirectory, rSufiResult, indicator); - FileUtils.copyFileToDirectory(csvFile, baseDir); + File csvFileCopied = new File(baseDir, indicator + ".csv"); + FileUtils.copyFile(csvFile, csvFileCopied); // ajout du fichier d'information sur les espèces incluses dans // les calculs des indicateurs de communautés @@ -1642,7 +1643,8 @@ Project project = projectService.openProject(projectDirectory.getName(), projectsDirectory); Selection selection = project.getSelections().get(selectionDirectory.getName()); File metaFile = generateMetaFilePDF(project, selection, resultDirectory, rSufiResult, indicator, locale); - FileUtils.copyFileToDirectory(metaFile, baseDir); + File metaFileCopied = new File(baseDir, "Information.pdf"); + FileUtils.copyFile(metaFile, metaFileCopied); // make zip result = File.createTempFile("coserchartdatazip-", ".zip"); @@ -1879,7 +1881,7 @@ */ protected File generateSourceZip(Project project, Selection selection, File resultDirectory, RSufiResult rSufiResult) throws CoserBusinessException { - if (rSufiResult.isDataAllowed()) { + if (!rSufiResult.isDataAllowed()) { throw new CoserBusinessException("Can't download source for non allowed result"); } @@ -2037,7 +2039,10 @@ // get indicator full name String indicatorName = (String)getIndicatorsMap().get(indicatorCode, locale); - indicatorList.add(indicatorName); + // peut arriver pour les indicateurs inconnu par coser + if (indicatorName != null) { + indicatorList.add(indicatorName); + } } // seconde pass, remplit la map speciesMap avec les listes configurées @@ -2071,7 +2076,7 @@ Integer[] bound = speciesTypeEntry.getValue(); if (speciesNumSys >= bound[0] && speciesNumSys <= bound[1]) { - speciesName = speciesTypeCode + " : " + speciesName; + speciesName += " : " + speciesTypeCode; break; } } 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 2011-01-26 15:09:45 UTC (rev 586) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/WebServiceTest.java 2011-01-26 15:10:40 UTC (rev 587) @@ -136,7 +136,7 @@ public void testSourceZipError() throws CoserBusinessException, IOException { registerUploadedResult("/web/upload2.zip"); - webService.getSourceZip("testzone1", "en"); + webService.getSourceZip("ecorse", "en"); } /** @@ -151,7 +151,7 @@ public void testSourceZip() throws CoserBusinessException, IOException { registerUploadedResult("/web/upload2.zip"); - File zip = webService.getSourceZip("ecorse", "en"); + File zip = webService.getSourceZip("testzone1", "en"); File tempDir = FileUtil.createTempDirectory("coser", ".tmp"); ZipUtil.uncompress(zip, tempDir); Assert.assertTrue(new File(tempDir, "projet1" + File.separator + "testcatch.csv").isFile());