This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository tutti. See http://git.codelutin.com/tutti.git commit 0a2a3734528cc060aa0257f1ac7be7585189fe81 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Apr 17 17:00:37 2015 +0200 refs #6989 correction du test pour supprimer les lots especes ou benthos --- .../importactions/ImportCatchAction.java | 37 ++++++++++++++-------- 1 file changed, 23 insertions(+), 14 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java index 58bb2d2..c13debd 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/importactions/ImportCatchAction.java @@ -117,8 +117,13 @@ public class ImportCatchAction extends ImportActionSupport { } - persistSpeciesBatches(); - persistBenthosBatches(); + if (importContext.getImportRequest().isImportSpecies()) { + persistSpeciesBatches(); + } + + if(importContext.getImportRequest().isImportBenthos()) { + persistBenthosBatches(); + } } @@ -131,13 +136,15 @@ public class ImportCatchAction extends ImportActionSupport { for (GenericFormatImportOperationContext fishingOperationContext : cruiseContext) { - boolean override = fishingOperationContext.isOverride(); +// boolean override = fishingOperationContext.isOverride(); +// +// if (override) { +// +// deleteSpeciesBatches(fishingOperationContext); +// +// } - if (override) { - - deleteSpeciesBatches(fishingOperationContext); - - } + deleteSpeciesBatches(fishingOperationContext); String cruiseStr = cruiseContext.getCruiseLabel(); String operationStr = fishingOperationContext.getFishingOperationLabel(); @@ -227,13 +234,15 @@ public class ImportCatchAction extends ImportActionSupport { for (GenericFormatImportOperationContext fishingOperationContext : cruiseContext) { - boolean override = fishingOperationContext.isOverride(); - - if (override) { +// boolean override = fishingOperationContext.isOverride(); +// +// if (override) { +// +// deleteBenthosBatches(fishingOperationContext); +// +// } - deleteBenthosBatches(fishingOperationContext); - - } + deleteBenthosBatches(fishingOperationContext); String cruiseStr = cruiseContext.getCruiseLabel(); String operationStr = fishingOperationContext.getFishingOperationLabel(); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.