Author: kmorin Date: 2013-05-22 15:37:31 +0200 (Wed, 22 May 2013) New Revision: 984 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/984 Log: fixes #2483 [IMPORT PUPITRI] ambiguit?\195?\169 sur la clef de lecture Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2013-05-22 12:28:46 UTC (rev 983) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRow.java 2013-05-22 13:37:31 UTC (rev 984) @@ -58,7 +58,7 @@ public static final String PROPERTY_WEIGHT = "weight"; - protected Integer operationCode; + protected String operationCode; protected String rigNumber; @@ -73,11 +73,11 @@ public CarrouselRow() { } - public Integer getOperationCode() { + public String getOperationCode() { return operationCode; } - public void setOperationCode(Integer operationCode) { + public void setOperationCode(String operationCode) { this.operationCode = operationCode; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2013-05-22 12:28:46 UTC (rev 983) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/CarrouselRowModel.java 2013-05-22 13:37:31 UTC (rev 984) @@ -41,15 +41,7 @@ // import definition - newMandatoryColumn(CarrouselRow.PROPERTY_OPERATION_CODE, new ValueParser<Integer>() { - - public Integer parse(String string) throws ParseException { - String number = string.substring(1); - Integer i = Integer.parseInt(number); - return i; - } - - }); + newMandatoryColumn(CarrouselRow.PROPERTY_OPERATION_CODE); newMandatoryColumn(CarrouselRow.PROPERTY_RIG_NUMBER); newMandatoryColumn(CarrouselRow.PROPERTY_SPECIES_ID, new ValueParser<String>() { Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java 2013-05-22 12:28:46 UTC (rev 983) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRow.java 2013-05-22 13:37:31 UTC (rev 984) @@ -54,7 +54,7 @@ public static final String PROPERTY_EMPTY = ""; - protected Integer operationCode; + protected String operationCode; protected String rigNumber; @@ -65,11 +65,11 @@ public TrunkRow() { } - public Integer getOperationCode() { + public String getOperationCode() { return operationCode; } - public void setOperationCode(Integer operationCode) { + public void setOperationCode(String operationCode) { this.operationCode = operationCode; } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java 2013-05-22 12:28:46 UTC (rev 983) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TrunkRowModel.java 2013-05-22 13:37:31 UTC (rev 984) @@ -40,15 +40,7 @@ // import definition - newMandatoryColumn(TrunkRow.PROPERTY_OPERATION_CODE, new ValueParser<Integer>() { - - public Integer parse(String string) throws ParseException { - String number = string.substring(1); - Integer i = Integer.parseInt(number); - return i; - } - - }); + newMandatoryColumn(TrunkRow.PROPERTY_OPERATION_CODE); newMandatoryColumn(TrunkRow.PROPERTY_RIG_NUMBER); newMandatoryColumn(TrunkRow.PROPERTY_DIRECTION, new ValueParser<Directions>() { @@ -70,7 +62,6 @@ newIgnoredColumn(TrunkRow.PROPERTY_DATE); newIgnoredColumn(TrunkRow.PROPERTY_TIME); newIgnoredColumn(TrunkRow.PROPERTY_BALANCE_ID); - newIgnoredColumn(TrunkRow.PROPERTY_EMPTY); } Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-05-22 12:28:46 UTC (rev 983) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/pupitri/TuttiPupitriImportExportService.java 2013-05-22 13:37:31 UTC (rev 984) @@ -177,8 +177,7 @@ TrunkRow.PROPERTY_OPERATION_CODE + separator + TrunkRow.PROPERTY_RIG_NUMBER + separator + TrunkRow.PROPERTY_DIRECTION + separator + - TrunkRow.PROPERTY_WEIGHT + separator + - TrunkRow.PROPERTY_EMPTY; + TrunkRow.PROPERTY_WEIGHT; FileUtils.writeLines(fileWithHeaders, Collections.singletonList(headers)); log.info(FileUtils.readFileToString(fileWithHeaders)); @@ -191,7 +190,7 @@ Float sortedWeight = 0f; Float rejectedWeight = 0f; - Integer operationNumber = operation.getFishingOperationNumber(); + String operationNumber = operation.getStationNumber(); String rigNumber = operation.getMultirigAggregation(); for (TrunkRow bean : importer) { @@ -280,7 +279,7 @@ reader = Files.newReader(fileWithHeaders, Charsets.UTF_8); carrouselImporter = Import.newImport(carrouselCsvModel, reader); - Integer operationNumber = operation.getFishingOperationNumber(); + String operationNumber = operation.getStationNumber(); String rigNumber = operation.getMultirigAggregation(); Float carrouselSortedWeight = 0f;