Author: tchemit Date: 2013-10-08 17:34:55 +0200 (Tue, 08 Oct 2013) New Revision: 1289 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1289 Log: fixes #3463: [CAPTURE] test des imports exports mutipostes, probl?\195?\168me sur import observations individuelles fixes #3464: [CAPTURE] test des imports exports mutipostes, probl?\195?\168me sur import capture accidentelle Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2013-10-08 15:19:57 UTC (rev 1288) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/MultiPostImportService.java 2013-10-08 15:34:55 UTC (rev 1289) @@ -895,7 +895,9 @@ // Import caracteristics - importIndividualObservationCaracteristics(file, batches, caracteristics); + importIndividualObservationCaracteristics(tempDir, + batches, + caracteristics); // Persist batches @@ -941,8 +943,6 @@ batch.setWeight(row.getWeight()); batch.setSize(row.getSize()); batch.setLengthStepCaracteristic(row.getLengthStepCaracteristic()); -// batch.setSamplingCode(row.getSamplingCode()); -// batch.setCalcifiedPieceSamplingCode(row.getCalcifiedPieceSamplingCode()); batch.setComment(row.getComment()); batch.setCaracteristics(new CaracteristicMap()); @@ -1052,7 +1052,9 @@ // Import caracteristics - importAccidentalCatchesCaracteristics(file, batches, caracteristics); + importAccidentalCatchesCaracteristics(tempDir, + batches, + caracteristics); // Persist batches @@ -1069,7 +1071,8 @@ persistenceService.invoke(call); } - protected Map<String, AccidentalBatch> importAccidentalCatchesBatches(File file, FishingOperation operation, + protected Map<String, AccidentalBatch> importAccidentalCatchesBatches(File file, + FishingOperation operation, List<Species> speciesList, List<CaracteristicQualitativeValue> genderValues, List<Caracteristic> caracteristics, @@ -1078,7 +1081,7 @@ Map<String, AccidentalBatch> batches = Maps.newLinkedHashMap(); Reader reader = TuttiIOUtil.newReader( - new File(file, INDIVIDUAL_OBSERVATION_FILE), + new File(file, ACCIDENTAL_CATCHES_FILE), n_("tutti.service.multipost.import.batches.error")); try { @@ -1122,7 +1125,8 @@ return batches; } - protected void importAccidentalCatchesCaracteristics(File file, Map<String, AccidentalBatch> batches, + protected void importAccidentalCatchesCaracteristics(File file, + Map<String, AccidentalBatch> batches, List<Caracteristic> caracteristics) { CaracteristicRowModel caracteristicModel = new CaracteristicRowModel(csvSeparator,