Author: bleny Date: 2010-12-15 14:11:33 +0000 (Wed, 15 Dec 2010) New Revision: 835 Log: fix import sampling plan Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java Modified: trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java =================================================================== --- trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-12-15 09:40:35 UTC (rev 834) +++ trunk/wao-business/src/main/java/fr/ifremer/wao/service/ServiceSamplingImpl.java 2010-12-15 14:11:33 UTC (rev 835) @@ -987,7 +987,6 @@ protected Profession importProfession(TopiaContext transaction, CsvReader reader) throws IOException, TopiaException { - String codeDCF5 = ImportHelper.read(reader, SAMPLING.METIER_CODE_DCF5); String maillage = ImportHelper.read(reader, SAMPLING.METIER_MAILLAGE); String taille = ImportHelper.read(reader, SAMPLING.METIER_TAILLE); String autre = ImportHelper.read(reader, SAMPLING.METIER_AUTRE); @@ -1073,6 +1072,8 @@ String comment = ImportHelper.read(reader, SAMPLING.PLAN_COMMENT); PeriodDates period = ImportHelper.readPeriod(reader, SAMPLING.PROGRAMME_DEBUT, SAMPLING.PROGRAMME_FIN); + String codeDCF5 = ImportHelper.read(reader, SAMPLING.METIER_CODE_DCF5); + codeDCF5 = codeDCF5.trim(); sampleRow.setFishingZonesInfos(fishingZoneInfos); sampleRow.setNbObservants(nbObservants); @@ -1081,6 +1082,7 @@ sampleRow.setPeriodBegin(period.getFromDate()); sampleRow.setPeriodEnd(period.getThruDate()); sampleRow.setComment(comment); + sampleRow.setDCF5Code(codeDCF5, " et "); // 16 fixed columns : 13 before months and 3 after int nbFixedColumns = 16;