This is an automated email from the git hooks/post-receive script. New commit to branch feature/6688 in repository tutti. See http://git.codelutin.com/tutti.git commit f063f8d237e8e90d170a7ca053d2399e99384c4a Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Feb 20 21:07:17 2015 +0100 operation parameters were not saved --- .../GenericFormatImportOperationContext.java | 10 +++++----- .../GenericformatImportPersitenceHelper.java | 23 +++++++++++++++++++--- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java index bce9d5b..9999ca6 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericFormatImportOperationContext.java @@ -67,12 +67,12 @@ public class GenericFormatImportOperationContext { return fishingOperationLabel; } - public boolean withParameters() { - - boolean withGearFeatures = MapUtils.isNotEmpty(gearUseFeatures); - boolean withVesselFeatures = MapUtils.isNotEmpty(vesselUseFeatures); - return withGearFeatures || withVesselFeatures; + public boolean withGearFeatures() { + return MapUtils.isNotEmpty(gearUseFeatures); + } + public boolean withVesselFeatures() { + return MapUtils.isNotEmpty(vesselUseFeatures); } public boolean withMarineLitterBatches() { diff --git a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java index 584441c..f1f8851 100644 --- a/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java +++ b/tutti-service/src/main/java/fr/ifremer/tutti/service/genericformat/GenericformatImportPersitenceHelper.java @@ -107,7 +107,7 @@ public class GenericformatImportPersitenceHelper { Iterable<GenericFormatImportOperationContext> fishingOperationContexts = importContext.getImportedFishingOperationContexts(new Predicate<GenericFormatImportOperationContext>() { @Override public boolean apply(GenericFormatImportOperationContext input) { - return input.withParameters(); + return input.withGearFeatures() || input.withVesselFeatures(); } }); @@ -115,9 +115,26 @@ public class GenericformatImportPersitenceHelper { FishingOperation fishingOperation = fishingOperationContext.getFishingOperation(); - if (log.isInfoEnabled()) { - log.info("Persist parameters of " + fishingOperationContext.getFishingOperationLabel() + " of cruise: " + cruiseDecorator.toString(fishingOperation.getCruise())); + if (fishingOperationContext.withGearFeatures()) { + + CaracteristicMap gearUseFeatures = fishingOperationContext.getGearUseFeatures(); + fishingOperation.setGearUseFeatures(gearUseFeatures); + if (log.isInfoEnabled()) { + log.info("Persist " + gearUseFeatures.size() + " gear use features of " + fishingOperationContext.getFishingOperationLabel() + " of cruise: " + cruiseDecorator.toString(fishingOperation.getCruise())); + } + + } + + if (fishingOperationContext.withVesselFeatures()) { + + CaracteristicMap vesselUseFeatures = fishingOperationContext.getVesselUseFeatures(); + fishingOperation.setVesselUseFeatures(vesselUseFeatures); + if (log.isInfoEnabled()) { + log.info("Persist " + vesselUseFeatures.size() + " vessel use features of " + fishingOperationContext.getFishingOperationLabel() + " of cruise: " + cruiseDecorator.toString(fishingOperation.getCruise())); + } + } + persistenceService.saveFishingOperation(fishingOperation); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.