Changeset 40974 for branches/ccl_branches/ipp-20190806/ippMonitor/def/detResidExp_noimage.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/detResidExp_noimage.d (modified) (2 diffs)

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

@@ -1 @@
-TABLE detResidExp, rawExp, detInputExp
+TABLE detResidExp JOIN rawExp USING (exp_id) JOIN detInputExp USING (exp_id)
 TITLE detResidExp
 FILE  detResidExp_noimage.php
@@ -5 +5 @@
 
 # the following WHERE clauses are added to all queries joined by AND
-WHERE detResidExp.exp_id = rawExp.exp_id
-WHERE detResidExp.exp_id = detInputExp.exp_id
 WHERE detResidExp.iteration = detInputExp.iteration
+
+RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
+UNRESTRICTED AND rawExp.dateobs >= CURDATE()
 
 # define image names to be used below