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 16a4f20c1dabcbdf6c0b10b373757f552fc0ad3f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Wed May 27 10:04:19 2015 +0200 refs #7146 : Nombre des calées selon le type d'association (224.712 ms ==> 96.1 ms) --- .../src/main/filters/observe-reports.properties | 118 +++++++++++---------- 1 file changed, 62 insertions(+), 56 deletions(-) diff --git a/observe-business/src/main/filters/observe-reports.properties b/observe-business/src/main/filters/observe-reports.properties index eaa800d..0aaa672 100644 --- a/observe-business/src/main/filters/observe-reports.properties +++ b/observe-business/src/main/filters/observe-reports.properties @@ -184,102 +184,108 @@ report.setByAssociation.rows=Coups positifs, Coups nuls, Total report.setByAssociation.operations.1=SumIntRow report.setByAssociation.operations.2=SumIntColumn report.setByAssociation.request.1=0,0|column|\ - Select Count(distinct a) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - left join a.observedSystem as so \ + Select Count(a) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a, \ + ObservedSystemImpl os \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ and a.setSeine.schoolType = 2 \ and a.setSeine.reasonForNullSet is null \ - and ((so is null and size(a.observedSystem) = 0) or (so.id != 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' and so in elements(a.observedSystem)) ) + and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ + and os not in elements(a.observedSystem) report.setByAssociation.request.2=0,1|column|\ - Select Count(distinct a) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a \ - left join a.observedSystem as so \ + Select Count(a) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a, \ + ObservedSystemImpl os \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ and a.setSeine.schoolType = 2 \ and a.setSeine.reasonForNullSet is not null \ - and ((so is null and size(a.observedSystem) = 0) or (so.id != 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' and so in elements(a.observedSystem)) ) + and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ + and os not in elements(a.observedSystem) report.setByAssociation.request.3=1,0|column|\ - Select Count(distinct a) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, ObservedSystemImpl so \ + Select Count(a) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a, \ + ObservedSystemImpl os \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ and a.setSeine.schoolType = 2 \ - and so.id = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' and so in elements(a.observedSystem) \ - and a.setSeine.reasonForNullSet is null + and a.setSeine.reasonForNullSet is null \ + and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ + and os in elements(a.observedSystem) report.setByAssociation.request.4=1,1|column|\ - Select Count(distinct a) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, ObservedSystemImpl so \ + Select Count(a) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a, \ + ObservedSystemImpl os \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ and a.setSeine.schoolType = 2 \ - and so.id = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' and so in elements(a.observedSystem) \ - and a.setSeine.reasonForNullSet is not null + and a.setSeine.reasonForNullSet is not null \ + and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9395222812356602' \ + and os in elements(a.observedSystem) report.setByAssociation.request.5=2,0|column|\ - Select Count(distinct a) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, ObservedSystemImpl so \ + Select Count(a) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a, \ + ObservedSystemImpl os \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ and a.setSeine.schoolType = 1 \ - and so.id = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' and so in elements(a.observedSystem) \ - and a.setSeine.reasonForNullSet is null + and a.setSeine.reasonForNullSet is null \ + and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ + and os in elements(a.observedSystem) report.setByAssociation.request.6=2,1|column|\ - Select Count(distinct a) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, ObservedSystemImpl so \ + Select Count(a) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a, \ + ObservedSystemImpl os \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ and a.setSeine.schoolType = 1 \ - and so.id = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' and so in elements(a.observedSystem) \ - and a.setSeine.reasonForNullSet is not null + and a.setSeine.reasonForNullSet is not null \ + and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ + and os in elements(a.observedSystem) report.setByAssociation.request.7=3,0|column|\ - Select Count(distinct a) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, ObservedSystemImpl so \ + Select Count(a) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a, \ + ObservedSystemImpl os \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ and a.setSeine.schoolType = 1 \ - and so.id = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' and so not in elements(a.observedSystem) \ - and a.setSeine.reasonForNullSet is null + and a.setSeine.reasonForNullSet is null \ + and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ + and os not in elements(a.observedSystem) report.setByAssociation.request.8=3,1|column|\ - Select Count(distinct a) \ - From TripSeineImpl m, RouteImpl r, ActivitySeineImpl a, ObservedSystemImpl so \ + Select Count(a) \ + From TripSeineImpl m \ + Join m.route r \ + Join r.activitySeine a, \ + ObservedSystemImpl os \ Where \ m.id = :tripId \ - and r in elements(m.route) \ - and a in elements(r.activitySeine) \ - and a.setSeine is not null \ and a.setSeine.schoolType = 1 \ - and so.id = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' and so not in elements(a.observedSystem) \ - and a.setSeine.reasonForNullSet is not null + and a.setSeine.reasonForNullSet is not null \ + and os.topiaId = 'fr.ird.observe.entities.referentiel.seine.ObservedSystem#1239832686428#0.9217864901728908' \ + and os not in elements(a.observedSystem) ################################################################################ ## Captures thon par type d'association -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@list.forge.codelutin.com>.