Author: bleny Date: 2013-05-13 15:45:20 +0200 (Mon, 13 May 2013) New Revision: 1656 Url: http://forge.codelutin.com/projects/wao/repository/revisions/1656 Log: fixes #2398 always use ',' as separator for multiple values in a single column Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java 2013-05-13 13:27:07 UTC (rev 1655) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/DCF5CodesParserFormatter.java 2013-05-13 13:45:20 UTC (rev 1656) @@ -37,7 +37,7 @@ public class DCF5CodesParserFormatter implements ValueParserFormatter<List<DCF5Code>> { - protected static final String DCF5_CODES_SEPARATOR = " et "; + protected static final String DCF5_CODES_SEPARATOR = ", "; @Override public String format(List<DCF5Code> dcf5Codes) { Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java 2013-05-13 13:27:07 UTC (rev 1655) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/io/csv2/models/operations/FishingZonesParserFormatter.java 2013-05-13 13:45:20 UTC (rev 1656) @@ -52,7 +52,7 @@ for (FishingZone fishingZone : fishingZones) { districtCodes.add(fishingZone.getDistrictCode()); } - return StringUtils.join(districtCodes, " / "); + return StringUtils.join(districtCodes, ", "); } @Override @@ -64,7 +64,7 @@ if (StringUtils.isBlank(districtCodes)) { throw new IllegalArgumentException(WaoUtils._("wao.import.sampleRow.failure.fishingZoneMissing")); } else { - String[] codes = districtCodes.split("/"); + String[] codes = districtCodes.split(","); for (String code : codes) { FishingZone fishingZone = indexedFishingZones.get(code.trim()); if (fishingZone == null) {