Author: kmorin Date: 2013-06-10 17:46:02 +0200 (Mon, 10 Jun 2013) New Revision: 1095 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1095 Log: fixes #2644 [IMP/EXP] - Import/Export multi-postes : Erreur lors de l'import d'un fichier Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-10 15:07:19 UTC (rev 1094) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/catches/multipost/TuttiMultiPostImportExportService.java 2013-06-10 15:46:02 UTC (rev 1095) @@ -524,13 +524,12 @@ final Map<String, SpeciesBatch> batches = Maps.newHashMap(); File tempDir = Files.createTempDir(); - FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), - _("tutti.service.multipost.resolveArchive.error", file)); - TuttiIOUtil.explode(fileObject, - tempDir, - new AllFileSelector(), - _("tutti.service.multipost.explodeArchive.error", file)); + try { + ZipUtil.uncompress(file, tempDir); + } catch (IOException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.uncompress.error", file)); + } //check operation CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); @@ -733,14 +732,12 @@ final Map<String, BenthosBatch> batches = Maps.newHashMap(); File tempDir = Files.createTempDir(); - FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), - _("tutti.service.multipost.resolveArchive.error", file)); + try { + ZipUtil.uncompress(file, tempDir); + } catch (IOException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.uncompress.error", file)); + } - TuttiIOUtil.explode(fileObject, - tempDir, - new AllFileSelector(), - _("tutti.service.multipost.explodeArchive.error", file)); - //check operation CatchWeightsRowModel weightsModel = new CatchWeightsRowModel(csvSeparator); checkSameOperation(tempDir, weightsModel, operation); @@ -942,14 +939,12 @@ final Map<String, MarineLitterBatch> batches = Maps.newHashMap(); File tempDir = Files.createTempDir(); - FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), - _("tutti.service.multipost.resolveArchive.error", file)); + try { + ZipUtil.uncompress(file, tempDir); + } catch (IOException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.uncompress.error", file)); + } - TuttiIOUtil.explode(fileObject, - tempDir, - new AllFileSelector(), - _("tutti.service.multipost.explodeArchive.error", file)); - //check operation MarineLitterWeightRowModel weightModel = new MarineLitterWeightRowModel(csvSeparator); checkSameOperation(tempDir, weightModel, operation); @@ -1072,14 +1067,12 @@ final Map<String, IndividualObservationBatch> batches = Maps.newLinkedHashMap(); File tempDir = Files.createTempDir(); - FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), - _("tutti.service.multipost.resolveArchive.error", file)); + try { + ZipUtil.uncompress(file, tempDir); + } catch (IOException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.uncompress.error", file)); + } - TuttiIOUtil.explode(fileObject, - tempDir, - new AllFileSelector(), - _("tutti.service.multipost.explodeArchive.error", file)); - //check operation FishingOperationRowModel operationModel = new FishingOperationRowModel(csvSeparator); checkSameOperation(tempDir, operationModel, operation); @@ -1188,14 +1181,12 @@ final Map<String, AccidentalBatch> batches = Maps.newLinkedHashMap(); File tempDir = Files.createTempDir(); - FileObject fileObject = TuttiIOUtil.resolveFile("zip:" + file.getAbsolutePath(), - _("tutti.service.multipost.resolveArchive.error", file)); + try { + ZipUtil.uncompress(file, tempDir); + } catch (IOException e) { + throw new TuttiTechnicalException(_("tutti.service.multipost.uncompress.error", file)); + } - TuttiIOUtil.explode(fileObject, - tempDir, - new AllFileSelector(), - _("tutti.service.multipost.explodeArchive.error", file)); - //check operation FishingOperationRowModel operationModel = new FishingOperationRowModel(csvSeparator); checkSameOperation(tempDir, operationModel, operation); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-06-10 15:07:19 UTC (rev 1094) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-06-10 15:46:02 UTC (rev 1095) @@ -106,6 +106,7 @@ tutti.service.multipost.import.weights.error= tutti.service.multipost.import.wrongOperation.error= tutti.service.multipost.resolveArchive.error= +tutti.service.multipost.uncompress.error= tutti.service.operations.accidental.error.species.required= tutti.service.operations.computeWeights.benthos.error.incoherentCategoryWeight= tutti.service.operations.computeWeights.benthos.error.incoherentParentCategoryWeight= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-06-10 15:07:19 UTC (rev 1094) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-06-10 15:46:02 UTC (rev 1095) @@ -84,7 +84,6 @@ tutti.service.exportSumatra.header.weight=Total tutti.service.mkDir.error=Erreur à la création du dossier %s tutti.service.multipost.attachment.copy.error=Erreur lors de l'export de la pièce-jointe %s -tutti.service.multipost.explodeArchive.error=Erreur lors de la décompression de l'archive tutti.service.multipost.export.attachments.error=Erreur lors de l'export des pièces-jointes tutti.service.multipost.export.batches.error=Erreur lors de l'export des lots tutti.service.multipost.export.deleteTempDirectory.error=Erreur lors de la suppression du dossier temporaire @@ -99,8 +98,8 @@ tutti.service.multipost.import.frequencies.error=Erreur lors de l'import des mensurations tutti.service.multipost.import.operation.error=Erreur lors de l'import des données du trait tutti.service.multipost.import.weights.error=Erreur lors de l'import des poids -tutti.service.multipost.import.wrongOperation.error=Opération est impossible<hr/>Les lots que vous essayez d'importer proviennent d'un autre trait :<br/>%s -tutti.service.multipost.resolveArchive.error=Erreur lors de l'ouverture de l'archive +tutti.service.multipost.import.wrongOperation.error=Opération est impossible<hr/>Les lots que vous essayez d'importer proviennent d'un autre trait \:<br/>%s +tutti.service.multipost.uncompress.error=Erreur lors de la décompression de l'archive %s tutti.service.operations.computeWeights.error.benthos.incoherentCategoryWeight=Benthos - Le poids total des mensurations du lot de %s/%s - %s (%skg) est supérieur au poids de la catégorie (%skg) tutti.service.operations.computeWeights.error.benthos.incoherentParentCategoryWeight=Benthos - Le poids du lot de %s/%s - %s (%skg) est inférieur à la somme des poids de ses sous-catégories (%skg) tutti.service.operations.computeWeights.error.benthos.incoherentRowWeightCategory=Le poids de sous-échantillon est renseigné alors que le lot n'a pas de poids.