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

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

@@ -1 @@
-TABLE chipRun, rawExp, chipProcessedImfile
+TABLE chipRun JOIN rawExp using (exp_id) JOIN chipProcessedImfile using (chip_id)
 TITLE chip Processed Imfile
 FILE  chipProcessedImfile.php
@@ -5 +5 @@
 
 # limit this table to non-OBJECT types of images
-WHERE chipRun.exp_id = rawExp.exp_id
-WHERE chipProcessedImfile.exp_id = chipRun.exp_id
-WHERE chipProcessedImfile.chip_id = chipRun.chip_id
 WHERE chipProcessedImfile.fault = 0
 
-RESTRICT_COUNT AND dateobs >= CURDATE()
-UNRESTRICTED AND dateobs >= CURDATE()
+RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
+UNRESTRICTED AND rawExp.dateobs >= CURDATE()
 
 #UNRESTRICTED WHERE 0=1