Author: chatellier Date: 2011-02-01 09:36:52 +0000 (Tue, 01 Feb 2011) New Revision: 629 Log: Fix pdf generation containing non escaped html entities Modified: trunk/changelog.txt trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-business/src/test/resources/web/upload1.zip trunk/coser-business/src/test/resources/web/upload2.zip Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-02-01 09:32:33 UTC (rev 628) +++ trunk/changelog.txt 2011-02-01 09:36:52 UTC (rev 629) @@ -4,6 +4,7 @@ 1.0.0-beta3 ----------- + * Fix pdf generation containing non escaped html entities * List projects names sorted alphabetically * Fix website texts * Close extract/upload view after extraction/upload @@ -15,7 +16,7 @@ * FileChooser opened to projectsDirectory * Update jaxx to 2.3 * Update nuiton-widgets to 1.1.1 - * Update nuiton-i18n to 2.2 + * Update nuiton-i18n to 2.3 1.0.0-beta2 ----------- 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-02-01 09:32:33 UTC (rev 628) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-02-01 09:36:52 UTC (rev 629) @@ -54,6 +54,7 @@ import org.apache.commons.collections.map.MultiKeyMap; import org.apache.commons.io.FileUtils; import org.apache.commons.io.IOUtils; +import org.apache.commons.lang.StringEscapeUtils; import org.apache.commons.lang.StringUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -2007,7 +2008,7 @@ Integer iMaxNumSys = Integer.valueOf(tuple[3]); specyTypes.put(specyTypeCode, new Integer[]{iMinNumSys, iMaxNumSys}); } - + // le fichier estpopind File estComIndFile = new File(resultDirectory, rsufiResult.getEstComIndName()); @@ -2035,7 +2036,7 @@ indicatorList = new TreeSet<String>(); indicatorMap.put(listNumber, indicatorList); } - + // get indicator full name String indicatorName = (String)getIndicatorsMap().get(indicatorCode, locale); // peut arriver pour les indicateurs inconnu par coser @@ -2043,7 +2044,7 @@ indicatorList.add(indicatorName); } } - + // seconde pass, remplit la map speciesMap avec les listes configurées // dans la selection for (String listNumber : indicatorMap.keySet()) { @@ -2068,6 +2069,9 @@ // get species full name String speciesName = projectService.getSpeciesDisplayName(project, speciesCode); + // fix html entities bug + speciesName = StringEscapeUtils.escapeHtml(speciesName); + // recupere le code type de l'espece, "m", "c", "p" ... Integer speciesNumSys = refTaxSpecies.get(speciesCode); for (Map.Entry<String, Integer[]> speciesTypeEntry : specyTypes.entrySet()) { 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)