Author: chatellier Date: 2011-02-04 14:20:13 +0000 (Fri, 04 Feb 2011) New Revision: 687 Log: Display species in italic style in generated pdf meta file Move to version 1.0.0-rc1 Modified: trunk/changelog.txt trunk/coser-business/pom.xml trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java trunk/coser-ui/pom.xml trunk/coser-web/pom.xml trunk/pom.xml Modified: trunk/changelog.txt =================================================================== --- trunk/changelog.txt 2011-02-04 13:57:49 UTC (rev 686) +++ trunk/changelog.txt 2011-02-04 14:20:13 UTC (rev 687) @@ -1,9 +1,10 @@ Coser release notes =================== -1.0.0-beta4 ------------ +1.0.0-rc1 +--------- + * Display species in italic style in generated pdf meta file * Add application zone in chart title * Add context support in application config for deploiement * Autoselection next selection accordion after validation Modified: trunk/coser-business/pom.xml =================================================================== --- trunk/coser-business/pom.xml 2011-02-04 13:57:49 UTC (rev 686) +++ trunk/coser-business/pom.xml 2011-02-04 14:20:13 UTC (rev 687) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta4-SNAPSHOT</version> + <version>1.0.0-rc1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> 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-04 13:57:49 UTC (rev 686) +++ trunk/coser-business/src/main/java/fr/ifremer/coser/services/WebService.java 2011-02-04 14:20:13 UTC (rev 687) @@ -2010,16 +2010,25 @@ // chargement du reftax et des code types especes pour connaitre // le type des especes de poissons // parcourt du fichier des types de données - Map<String, Integer> refTaxSpecies = new HashMap<String, Integer>(); + Map<String, Integer> refTaxSpeciesNumSys = new HashMap<String, Integer>(); + Map<String, String> refTaxSpeciesName = new HashMap<String, String>(); Iterator<String[]> itReftax = project.getRefTaxSpecies().iterator(true); while (itReftax.hasNext() ) { String[] tuple = itReftax.next(); // "C_Perm","NumSys","NivSys","C_VALIDE","L_VALIDE","AA_VALIDE","C_TxP\u00E8re","Taxa" - String specyName = tuple[3]; + String speciesCode = tuple[3]; Integer iNumSys = Integer.valueOf(tuple[1]); - refTaxSpecies.put(specyName, iNumSys); + refTaxSpeciesNumSys.put(speciesCode, iNumSys); + + // fix html entities bug + String speciesSciName = StringEscapeUtils.escapeXml(tuple[4]); + String speciesAuthor = StringEscapeUtils.escapeXml(tuple[5]); + + // TODO little hack for italic species + refTaxSpeciesName.put(speciesCode, "<span style='font-style:italic'>" + speciesSciName + "</span> " + speciesAuthor); } + /* plus demandé, mais on ne sais jamais Map<String, Integer[]> specyTypes = new HashMap<String, Integer[]>(); Iterator<String[]> itTypeSpecies = project.getTypeEspeces().iterator(true); while (itTypeSpecies.hasNext()) { @@ -2030,7 +2039,7 @@ Integer iMinNumSys = Integer.valueOf(tuple[2]); Integer iMaxNumSys = Integer.valueOf(tuple[3]); specyTypes.put(specyTypeCode, new Integer[]{iMinNumSys, iMaxNumSys}); - } + }*/ // le fichier estpopind File estComIndFile = new File(resultDirectory, rsufiResult.getEstComIndName()); @@ -2090,13 +2099,11 @@ for (String speciesCode : selectionSpeciesList) { // get species full name - String speciesName = projectService.getSpeciesDisplayName(project, speciesCode); - - // fix html entities bug - speciesName = StringEscapeUtils.escapeXml(speciesName); - + String speciesName = refTaxSpeciesName.get(speciesCode); + + /* plus demandé, mais on ne sait jamais // recupere le code type de l'espece, "m", "c", "p" ... - Integer speciesNumSys = refTaxSpecies.get(speciesCode); + Integer speciesNumSys = refTaxSpeciesNumSys.get(speciesCode); for (Map.Entry<String, Integer[]> speciesTypeEntry : specyTypes.entrySet()) { String speciesTypeCode = speciesTypeEntry.getKey(); Integer[] bound = speciesTypeEntry.getValue(); @@ -2106,7 +2113,7 @@ break; } } - // end code type espece + // end code type espece*/ speciesList.add(speciesName); } Modified: trunk/coser-ui/pom.xml =================================================================== --- trunk/coser-ui/pom.xml 2011-02-04 13:57:49 UTC (rev 686) +++ trunk/coser-ui/pom.xml 2011-02-04 14:20:13 UTC (rev 687) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta4-SNAPSHOT</version> + <version>1.0.0-rc1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/coser-web/pom.xml =================================================================== --- trunk/coser-web/pom.xml 2011-02-04 13:57:49 UTC (rev 686) +++ trunk/coser-web/pom.xml 2011-02-04 14:20:13 UTC (rev 687) @@ -6,7 +6,7 @@ <parent> <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta4-SNAPSHOT</version> + <version>1.0.0-rc1-SNAPSHOT</version> </parent> <groupId>fr.ifremer.coser</groupId> Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2011-02-04 13:57:49 UTC (rev 686) +++ trunk/pom.xml 2011-02-04 14:20:13 UTC (rev 687) @@ -11,7 +11,7 @@ <groupId>fr.ifremer</groupId> <artifactId>coser</artifactId> - <version>1.0.0-beta4-SNAPSHOT</version> + <version>1.0.0-rc1-SNAPSHOT</version> <packaging>pom</packaging> <modules>