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 f4198e89d2a276c6d85b3b1afd2486251dd769f4 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sat Aug 23 15:42:24 2014 +0200 fixes #5656: Les engins d'une campagne ne sont plus remontés --- .../service/CruisePersistenceServiceImpl.java | 42 +++++++++++----------- 1 file changed, 20 insertions(+), 22 deletions(-) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java index e358298..389e1bc 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/CruisePersistenceServiceImpl.java @@ -239,30 +239,28 @@ public class CruisePersistenceServiceImpl extends AbstractPersistenceService imp // surverPart result.setSurveyPart((String) source[index]); - // get secondary gears from fishingOperation (first load from Allegro DB only) - if (result.getGear() == null) { - Iterator<Object[]> list = queryList( - "allCruiseGears", - "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id), - "pmfmIdTrawlNet", IntegerType.INSTANCE, PmfmId2.MULTIRIG_NUMBER.getValue()); + // get cruise gears + Iterator<Object[]> list = queryList( + "allCruiseGears", + "cruiseId", IntegerType.INSTANCE, Integer.valueOf(id), + "pmfmIdTrawlNet", IntegerType.INSTANCE, PmfmId2.MULTIRIG_NUMBER.getValue()); - List<GearWithOriginalRankOrder> gears = Lists.newArrayList(); - int maxMultirigNumberFound = 0; - while (list.hasNext()) { - Object[] gearRow = list.next(); - Gear simpleGear = referentialService.getGear((Integer) gearRow[0]); - GearWithOriginalRankOrder target = GearWithOriginalRankOrders.newGearWithOriginalRankOrder(simpleGear); - target.setRankOrder((Short) gearRow[1]); - Float multirigNumber = (Float) gearRow[2]; - if (multirigNumber != null && multirigNumber.intValue() > maxMultirigNumberFound) { - maxMultirigNumberFound = multirigNumber.intValue(); - } - gears.add(target); - } - result.setGear(gears); - if (maxMultirigNumberFound > 0) { - result.setMultirigNumber(maxMultirigNumberFound); + List<GearWithOriginalRankOrder> gears = Lists.newArrayList(); + int maxMultirigNumberFound = 0; + while (list.hasNext()) { + Object[] gearRow = list.next(); + Gear simpleGear = referentialService.getGear((Integer) gearRow[0]); + GearWithOriginalRankOrder target = GearWithOriginalRankOrders.newGearWithOriginalRankOrder(simpleGear); + target.setRankOrder((Short) gearRow[1]); + Float multirigNumber = (Float) gearRow[2]; + if (multirigNumber != null && multirigNumber.intValue() > maxMultirigNumberFound) { + maxMultirigNumberFound = multirigNumber.intValue(); } + gears.add(target); + } + result.setGear(gears); + if (maxMultirigNumberFound > 0) { + result.setMultirigNumber(maxMultirigNumberFound); } Iterator<Object[]> vesselPersonFeaturesList = queryList( -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.