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

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

@@ -1 @@
-TABLE camRun, camProcessedExp, chipRun, rawExp, chipProcessedImfile
+TABLE camRun JOIN camProcessedExp using (cam_id) JOIN chipRun using (chip_id) JOIN rawExp using (exp_id) JOIN chipProcessedImfile using (chip_id) 
 TITLE Camera Processed Imfiles
 FILE  camProcessedImfile.php
@@ -6 +6 @@
 # the following WHERE clauses are added to all queries joined by AND
 WHERE camRun.state = 'full'
-WHERE camRun.chip_id = chipRun.chip_id
-WHERE chipRun.exp_id = rawExp.exp_id
-WHERE camProcessedExp.cam_id = camRun.cam_id
-WHERE chipProcessedImfile.chip_id = camRun.chip_id
 
-RESTRICT_COUNT AND dateobs >= CURDATE()
-UNRESTRICTED AND dateobs >= CURDATE()
+RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
+UNRESTRICTED AND rawExp.dateobs >= CURDATE()
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id