Author: kmorin Date: 2013-05-02 12:32:02 +0200 (Thu, 02 May 2013) New Revision: 911 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/911 Log: fixes #2393 [CAMPAGNE] - Engins - Tous les engins asoci?\195?\169s aux campagnes sont retourn?\195?\169s en tant qu'engins scientifiques Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml Modified: trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java =================================================================== --- trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-05-02 10:00:47 UTC (rev 910) +++ trunk/tutti-persistence/src/main/java/fr/ifremer/tutti/persistence/service/ReferentialPersistenceServiceImpl.java 2013-05-02 10:32:02 UTC (rev 911) @@ -30,6 +30,7 @@ import fr.ifremer.adagio.core.dao.data.vessel.VesselExtendDao; import fr.ifremer.adagio.core.dao.referential.StatusDao; import fr.ifremer.adagio.core.dao.referential.gear.FishingGearExtendDao; +import fr.ifremer.adagio.core.dao.referential.gear.GearClassification; import fr.ifremer.adagio.core.dao.referential.location.LocationExtendDao; import fr.ifremer.adagio.core.dao.referential.taxon.TaxonNameExtendDao; import fr.ifremer.adagio.core.dao.referential.taxon.TaxonRefVO; @@ -316,7 +317,7 @@ List<Gear> result = Lists.newArrayList(); while (sources.hasNext()) { Object[] source = sources.next(); - Gear target = loadGear(source, true); + Gear target = loadGear(source); result.add(target); } return Collections.unmodifiableList(result); @@ -330,7 +331,7 @@ List<Gear> result = Lists.newArrayList(); while (sources.hasNext()) { Object[] source = sources.next(); - Gear target = loadGear(source, false); + Gear target = loadGear(source); result.add(target); } return Collections.unmodifiableList(result); @@ -369,7 +370,7 @@ "gear", "gearId", IntegerType.INSTANCE, gearId); - Gear result = source == null ? null : loadGear(source, true); + Gear result = source == null ? null : loadGear(source); return result; } @@ -902,14 +903,19 @@ return target; } - protected Gear loadGear(Object[] source, boolean scientificGear) { + protected Gear loadGear(Object[] source) { Gear result = TuttiBeanFactory.newGear(); result.setId(String.valueOf(source[0])); result.setLabel((String) source[1]); result.setName((String) source[2]); - result.setScientificGear(scientificGear); + GearClassification classification = (GearClassification) source[3]; + boolean scientific = false; + if (classification != null) { + scientific = classification.getId().equals(enumeration.GEAR_CLASSIFICIATION_ID_SCIENTIFIC); + } + result.setScientificGear(scientific); - setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[3], result); + setStatus((fr.ifremer.adagio.core.dao.referential.Status) source[4], result); return result; } Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-05-02 10:00:47 UTC (rev 910) +++ trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-05-02 10:32:02 UTC (rev 911) @@ -695,6 +695,7 @@ g.id, g.label, g.name, + g.gearClassification, g.status AS status FROM GearImpl g WHERE @@ -713,6 +714,7 @@ g.id, g.label, g.name, + g.gearClassification, g.status AS status FROM GearImpl g WHERE