branch feature/7146 updated (72b755f -> d43fc07)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7146 in repository observe. See http://git.codelutin.com/observe.git from 72b755f refs #7146 : Nombre de calées et captures journalières d'une marée (33.262 ms ==> 11.52 ms) new d43fc07 refs #7146 : Utilisation des DCP (288.789 ms ==> 123.227 ms) The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit d43fc07861d07fe8ca9a327fd36e4627a079f93f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 26 16:50:09 2015 +0200 refs #7146 : Utilisation des DCP (288.789 ms ==> 123.227 ms) Summary of changes: .../src/main/filters/observe-reports.properties | 71 +++++++++++----------- 1 file changed, 35 insertions(+), 36 deletions(-) -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
This is an automated email from the git hooks/post-receive script. New commit to branch feature/7146 in repository observe. See http://git.codelutin.com/observe.git commit d43fc07861d07fe8ca9a327fd36e4627a079f93f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue May 26 16:50:09 2015 +0200 refs #7146 : Utilisation des DCP (288.789 ms ==> 123.227 ms) --- .../src/main/filters/observe-reports.properties | 71 +++++++++++----------- 1 file changed, 35 insertions(+), 36 deletions(-) diff --git a/observe-business/src/main/filters/observe-reports.properties b/observe-business/src/main/filters/observe-reports.properties index 740f352..6dc3e53 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -81,13 +81,15 @@ report.dailySetAndCatch.request.1=0,0|row|\ report.dcpUsage.name=Utilisation des DCP report.dcpUsage.description=Tableau r\u00e9capitulatif du nombre de DCP visit\u00e9s selon l\u2019action effectu\u00e9e (visites avec et sans p\u00eache, mis \u00e0 l\u2019eau, r\u00e9cuperation), et tortues observ\u00e9es report.dcpUsage.columns=Type de DCP (Tableau 8),Nombre visit\u00e9s,Nombre p\u00each\u00e9s,Nombre mis \u00e0 l\u2019eau seuls,Nombre renforc\u00e9s par radeau balis\u00e9,R\u00e9cup\u00e9r\u00e9 sans p\u00eache,Nombre de tortues associ\u00e9es -report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|Select to.id From ObjectTypeImpl to Where to In (Select to From ObjectTypeImpl to, TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp \ +report.dcpUsage.repeatVariable.typeObjetId=java.lang.String|\ + Select to.id \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Join dcp.objectType to \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and dcp in elements(a.floatingObject) \ - and to = dcp.objectType) \ Order by to.code report.dcpUsage.request.1=0,0|row|\ @@ -99,79 +101,76 @@ report.dcpUsage.request.1.repeat=typeObjetId|column report.dcpUsage.request.2=1,0|row|\ Select Count(dcp) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and dcp in elements(a.floatingObject) \ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.code = 2 report.dcpUsage.request.2.repeat=typeObjetId|column report.dcpUsage.request.3=2,0|row|\ Select Count(dcp) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and dcp in elements(a.floatingObject) \ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.code = 3 report.dcpUsage.request.3.repeat=typeObjetId|column report.dcpUsage.request.4=3,0|row|\ Select Count(dcp) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and dcp in elements(a.floatingObject) \ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.code = 1 report.dcpUsage.request.4.repeat=typeObjetId|column report.dcpUsage.request.5=4,0|row|\ Select Count(dcp) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and dcp in elements(a.floatingObject) \ and dcp.objectType.id = :typeObjetId \ - and ( dcp.objectFate.code = 8 and dcp.objectOperation.code != 1 ) + and dcp.objectFate.code = 8 \ + and dcp.objectOperation.code != 1 report.dcpUsage.request.5.repeat=typeObjetId|column report.dcpUsage.request.6=5,0|row|\ Select Count(dcp) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and dcp in elements(a.floatingObject) \ and dcp.objectType.id = :typeObjetId \ and dcp.objectOperation.code = 4 report.dcpUsage.request.6.repeat=typeObjetId|column report.dcpUsage.request.7=6,0|row| \ Select Sum(efo.count) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, FloatingObjectImpl dcp, ObjectObservedSpeciesImpl efo \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a \ + Join a.floatingObject dcp \ + Join dcp.objectObservedSpecies efo \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and dcp in elements(a.floatingObject) \ and dcp.objectType.id = :typeObjetId \ - and efo in elements(dcp.objectObservedSpecies) \ - and efo.species in ( \ - Select distinct ef2 From SpeciesImpl ef2, SpeciesGroupImpl gef2 \ - Where ef2.speciesGroup = gef2 \ - and gef2.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' \ - ) + and efo.species.speciesGroup.id = 'fr.ird.observe.entities.referentiel.SpeciesGroup#1239832683690#0.24333033683679461' report.dcpUsage.request.7.repeat=typeObjetId|column ################################################################################ -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.
participants (1)
-
codelutin.com scm