Changeset 40974 for branches/ccl_branches/ipp-20190806/ippMonitor/def/detResidImfile_failure.d

Timestamp:

Oct 27, 2019, 9:47:12 PM (7 years ago)

Author:

cclin33

Message:

sync from trunk with r40973

Location:

branches/ccl_branches/ipp-20190806/ippMonitor

Files:

• . (modified) (1 prop)
• def/detResidImfile_failure.d (modified) (2 diffs)

branches/ccl_branches/ipp-20190806/ippMonitor/def/detResidImfile_failure.d

@@ -1 @@
-TABLE detResidImfile, rawExp, rawImfile
+TABLE detResidImfile JOIN rawExp USING (exp_id) JOIN rawImfile USING (exp_id)
 TITLE detResidImfile Failures
 FILE  detResidImfile_failure.php
@@ -5 +5 @@
 
 # the following WHERE clauses are added to all queries joined by AND
-WHERE detResidImfile.exp_id = rawExp.exp_id
-WHERE detResidImfile.exp_id = rawImfile.exp_id
 WHERE detResidImfile.class_id = rawImfile.class_id
 WHERE detResidImfile.fault > 0
+
+RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
+UNRESTRICTED AND rawExp.dateobs >= CURDATE()
 
 ARGS  ARG1 detResidImfile.det_id=$detResidImfile.det_id