Author: chatellier Date: 2011-01-26 09:15:32 +0000 (Wed, 26 Jan 2011) New Revision: 580 Log: Fix community meta file generation (with tests) Modified: trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java trunk/coser-business/src/test/resources/web/upload1.zip trunk/coser-business/src/test/resources/web/upload2.zip 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-25 22:43:11 UTC (rev 579) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-01-26 09:15:32 UTC (rev 580) @@ -1646,7 +1646,7 @@ // make zip result = File.createTempFile("coserchartdatazip-", ".zip"); - result.deleteOnExit(); + //result.deleteOnExit(); ZipUtil.compress(result, baseDir); // clean directory @@ -2019,9 +2019,9 @@ // Campagne Indicateur Liste Strate Annee Estimation EcartType CV DataStorage dataStorage = importService.loadCSVFile(estComIndFile, CoserConstants.CSV_RESULT_SEPARATOR_CHAR); - Iterator<String[]> estPopIndIterator = dataStorage.iterator(true); - while (estPopIndIterator.hasNext()) { - String[] tuple = estPopIndIterator.next(); + Iterator<String[]> estComIndIterator = dataStorage.iterator(true); + while (estComIndIterator.hasNext()) { + String[] tuple = estComIndIterator.next(); String indicatorCode = tuple[1]; String listIdCode = tuple[2]; // c1, p2, T3 ... @@ -2029,7 +2029,7 @@ String listNumber = listIdCode.substring(1); // 1, 2, 3 // get indicator list - SortedSet<String> indicatorList = indicatorMap.get(listIdCode); + SortedSet<String> indicatorList = indicatorMap.get(listNumber); if (indicatorList == null) { indicatorList = new TreeSet<String>(); indicatorMap.put(listNumber, indicatorList); Modified: trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java =================================================================== --- trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2011-01-25 22:43:11 UTC (rev 579) +++ trunk/coser-business/src/test/java/fr/ifremer/coser/services/CoserTestAbstract.java 2011-01-26 09:15:32 UTC (rev 580) @@ -82,7 +82,7 @@ config = new CoserBusinessConfig(); config.setDatabaseDirectory(testDirectory.getAbsolutePath()); - I18n.init(Locale.UK); + I18n.init(null, Locale.UK); FileUtils.copyDirectory(new File("src" + File.separator + "test" + File.separator + "resources", "projects"), @@ -104,7 +104,7 @@ @AfterClass public static void cleanDirectory() throws IOException { - //FileUtils.deleteDirectory(testDirectory); + FileUtils.deleteDirectory(testDirectory); } /** Modified: trunk/coser-business/src/test/resources/web/upload1.zip =================================================================== (Binary files differ) Modified: trunk/coser-business/src/test/resources/web/upload2.zip =================================================================== (Binary files differ)