Index: trunk/ippMonitor/def/stackInputSkyfile.d
===================================================================
--- trunk/ippMonitor/def/stackInputSkyfile.d	(revision 30989)
+++ trunk/ippMonitor/def/stackInputSkyfile.d	(revision 40882)
@@ -1,19 +1,12 @@
-TABLE stackInputSkyfile, stackRun, warpRun, warpSkyfile, fakeRun, camRun, camProcessedExp, chipRun, rawExp
+TABLE stackInputSkyfile JOIN stackRun USING (stack_id) JOIN warpRun USING (warp_id) JOIN warpSkyfile USING (warp_id) JOIN fakeRun USING (fake_id) JOIN camRun USING (cam_id) JOIN camProcessedExp USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
 TITLE Stack Input Exposures
 FILE  stackInputSkyfile.php
 MENU  ipp.stack.dat
 
-WHERE stackRun.stack_id = stackInputSkyfile.stack_id
-WHERE stackInputSkyfile.warp_id = warpRun.warp_id
-WHERE warpRun.fake_id = fakeRun.fake_id
-WHERE warpSkyfile.warp_id = warpRun.warp_id
-WHERE warpSkyfile.skycell_id = stackRun.skycell_id
-WHERE fakeRun.cam_id = camRun.cam_id
-WHERE camProcessedExp.cam_id = camRun.cam_id
-WHERE camRun.chip_id = chipRun.chip_id
-WHERE chipRun.exp_id = rawExp.exp_id
+RESTRICT_COUNT WHERE rawExp.dateobs >= CURDATE()
+UNRESTRICTED WHERE rawExp.dateobs >= CURDATE()
 
 # if no query restrictions are supplied, we want to limit the query or it is extremely long running:
-UNRESTRICTED AND stackRun.stack_id = 0
+#UNRESTRICTED AND stackRun.stack_id = 0
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id