Index: trunk/ippMonitor/def/warpSkycellMap.d
===================================================================
--- trunk/ippMonitor/def/warpSkycellMap.d	(revision 27892)
+++ trunk/ippMonitor/def/warpSkycellMap.d	(revision 40882)
@@ -1,11 +1,9 @@
-TABLE warpSkyCellMap, warpRun, camProcessedExp, chipRun, rawExp
+TABLE warpSkyCellMap JOIN warpRun USING (warp_id) JOIN camProcessedExp USING (cam_id) JOIN chipRun USING (chip_id) JOIN rawExp USING (exp_id)
 TITLE warpSkyCellMap
 FILE  warpSkycellMap.php
 MENU  ipp.science.dat
 
-WHERE warpSkyCellMap.warp_id     = warpRun.warp_id
-WHERE warpSkyCellMap.cam_id      = camProcessedExp.cam_id
-WHERE camProcessedExp.chip_id    = chipRun.chip_id
-WHERE chipRun.exp_id = rawExp.exp_id
+RESTRICT_COUNT AND rawExp.dateobs >= CURDATE()
+UNRESTRICTED AND rawExp.dateobs >= CURDATE()
 
 OP   OP1  $rawExp.ra * 57.295783