This is an automated email from the git hooks/post-receive script. New commit to branch develop-3.x in repository tutti. See http://git.codelutin.com/tutti.git commit 0f99c260f71449b07fdc747b1f260aa3fbb0d369 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri May 1 11:20:57 2015 +0200 consolidation des espèces de tous les lots avant l'import (refs #7042) --- .../ifremer/tutti/service/bigfin/BigfinImportService.java | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java index 4fb893e..b29b0f6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/bigfin/BigfinImportService.java @@ -169,7 +169,8 @@ public class BigfinImportService extends AbstractTuttiService { Integer referenceTaxonId = species.getReferenceTaxonId(); Preconditions.checkNotNull(referenceTaxonId, "Can't have a null referenceTaxonId for species: " + species); Species species1 = speciesByReferenceTaxonId.get(referenceTaxonId.toString()); - speciesBatch.setSpecies(species1); + consolidateSpecies(speciesBatch, species1); + } } @@ -179,6 +180,18 @@ public class BigfinImportService extends AbstractTuttiService { } + protected void consolidateSpecies(SpeciesBatch speciesBatch, Species species) { + + speciesBatch.setSpecies(species); + if (!speciesBatch.isChildBatchsEmpty()) { + + for (SpeciesBatch childBatch : speciesBatch.getChildBatchs()) { + consolidateSpecies(childBatch, species); + } + } + + } + public BigfinImportResult importFile(File importFile, FishingOperation operation, CatchBatch catchBatch) { Preconditions.checkNotNull(importFile); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.