Index: trunk/ippMonitor/def/failedWarpSkyfiles.d
===================================================================
--- trunk/ippMonitor/def/failedWarpSkyfiles.d	(revision 37983)
+++ trunk/ippMonitor/def/failedWarpSkyfiles.d	(revision 40882)
@@ -1,13 +1,11 @@
-TABLE warpSkyfile, warpRun, fakeRun, camRun, chipRun, rawExp
+TABLE warpSkyfile JOIN warpRun USING (warp_id) JOIN fakeRun USING (fake_id) JOIN camRun USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
 TITLE Warp Failed Skyfiles
 FILE  failedWarpSkyfiles.php
 MENU  ipp.science.dat
 
-WHERE warpSkyfile.warp_id = warpRun.warp_id
-WHERE warpRun.fake_id = fakeRun.fake_id
-WHERE fakeRun.cam_id = camRun.cam_id
-WHERE camRun.chip_id = chipRun.chip_id
-WHERE chipRun.exp_id = rawExp.exp_id
 WHERE warpSkyfile.fault != 0
+
+RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
+UNRESTRICTED AND rawExp.dateobs >= CURDATE()
 
 ARGS  ARG1  rawImfile.exp_id=$rawExp.exp_id