Author: tchemit Date: 2013-02-28 12:59:26 +0100 (Thu, 28 Feb 2013) New Revision: 503 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/503 Log: fix query + remove no more use IdAware service file Removed: trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml Deleted: trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware =================================================================== --- trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware 2013-02-28 11:31:03 UTC (rev 502) +++ trunk/tutti-persistence/src/main/resources/META-INF/services/fr.ifremer.tutti.persistence.entities.IdAware 2013-02-28 11:59:26 UTC (rev 503) @@ -1,20 +0,0 @@ -fr.ifremer.tutti.persistence.entities.data.Attachment -fr.ifremer.tutti.persistence.entities.data.AccidentalBatch -fr.ifremer.tutti.persistence.entities.data.BenthosBatch -fr.ifremer.tutti.persistence.entities.data.FishingOperation -fr.ifremer.tutti.persistence.entities.data.MacroWasteBatch -fr.ifremer.tutti.persistence.entities.data.PlanktonBatch -fr.ifremer.tutti.persistence.entities.data.Program -fr.ifremer.tutti.persistence.entities.data.Cruise -fr.ifremer.tutti.persistence.entities.data.SpeciesBatch -fr.ifremer.tutti.persistence.entities.data.SpeciesBatchFrequency -fr.ifremer.tutti.persistence.entities.protocol.TuttiProtocol -fr.ifremer.tutti.persistence.entities.referential.CaracteristicQualitativeValue -fr.ifremer.tutti.persistence.entities.referential.Country -fr.ifremer.tutti.persistence.entities.referential.FishingOperationLocation -fr.ifremer.tutti.persistence.entities.referential.Gear -fr.ifremer.tutti.persistence.entities.referential.Caracteristic -fr.ifremer.tutti.persistence.entities.referential.Person -fr.ifremer.tutti.persistence.entities.referential.Species -fr.ifremer.tutti.persistence.entities.referential.Vessel -fr.ifremer.tutti.persistence.entities.referential.Zone \ No newline at end of file Modified: trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml =================================================================== --- trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-02-28 11:31:03 UTC (rev 502) +++ trunk/tutti-persistence/src/main/resources/queries-override.hbm.xml 2013-02-28 11:59:26 UTC (rev 503) @@ -78,7 +78,7 @@ <!-- [DAT-03] Get a detail program --> <query name="program"> <![CDATA[ - SELECT + SELECT p.code, p.name, p.description, @@ -119,7 +119,10 @@ mp.id AS managerId, sc.comments AS scientificCruiseComments, ft.comments AS fishingTripComments, - (select sm.alphanumericalValue from SurveyMeasurementImpl sm where sm.fishingTrip.id=ft.id and sm.pmfm.id= :pmfmIdSurveyPart) AS surveyPart, + (SELECT sm.alphanumericalValue + FROM SurveyMeasurementImpl sm + WHERE sm.fishingTrip.id=ft.id AND sm.pmfm.id= :pmfmIdSurveyPart + ) AS surveyPart FROM ScientificCruiseImpl sc LEFT OUTER JOIN sc.fishingTrips ft