Index: trunk/ippMonitor/def/mopsStatus.d
===================================================================
--- trunk/ippMonitor/def/mopsStatus.d	(revision 29481)
+++ trunk/ippMonitor/def/mopsStatus.d	(revision 29483)
@@ -1,17 +1,15 @@
-TABLE rawExp LEFT JOIN chipRun using(exp_id) LEFT JOIN camRun using(chip_id) LEFT JOIN fakeRun using(cam_id) LEFT JOIN warpRun using(fake_id) LEFT JOIN diffInputSkyfile AS diffInput ON diffInput.warp1 = warp_id LEFT JOIN diffRun AS diffInputRun ON diffInput.diff_id = diffInputRun.diff_id LEFT JOIN diffInputSkyfile AS diffTemplate ON diffTemplate.warp2 = warp_id LEFT JOIN diffRun AS diffTemplateRun ON diffTemplate.diff_id = diffTemplateRun.diff_id LEFT JOIN publishRun ON stage_id=diffInput.diff_id 
-#LEFT JOIN publishRun ON publishRun.stage_id=diffInput.diff_id diffInputRun.diff_id 
+TABLE rawExp LEFT JOIN chipRun using(exp_id) LEFT JOIN camRun using(chip_id) LEFT JOIN fakeRun using(cam_id) LEFT JOIN warpRun using(fake_id) LEFT JOIN diffInputSkyfile AS diffInput ON diffInput.warp1 = warp_id LEFT JOIN diffRun AS diffInputRun ON diffInput.diff_id = diffInputRun.diff_id LEFT JOIN diffInputSkyfile AS diffTemplate ON diffTemplate.warp2 = warp_id LEFT JOIN diffRun AS diffTemplateRun ON diffTemplate.diff_id = diffTemplateRun.diff_id LEFT JOIN publishRun ON stage_id=diffInput.diff_id
 TITLE MOPS Status
 FILE mopsStatus.php
 MENU ipp.imfiles.dat
 
-# WHERE object != 'ENGINEERING'
-# WHERE chipRun.data_group like 'OSS.%'
-
-# WHERE comment like 'OSS.%'
-WHERE dateobs >= CURDATE()
+UNRESTRICTED WHERE 0=1
 
 # OP  OP1   ($ddiff_id > 0 ? $ddiff_id : $tdiff_id)
-OP  OP1   $ddiffId.":".$tdiffId
-OP  OP2   "[".$diffInput.diff_id."]:[".$tdiff_id."]"
+# OP  OP1   $ddiffId.":".$tdiffId
+OP OP1 ($row[8]>$row[9]?$row[8]. "(1)":($row[9]!=0?$row[9]. "(2)":"0"))
+# $diffInput.diff_id+$diffTemplate.diff_id
+OP OP2 $row[8]+$row[9]
+#  "[".$diffInput.diff_id."]:[".$tdiff_id."]"
 
 #     field                    width format  name          show         link to                   extras
@@ -24,8 +22,8 @@
 FIELD fake_id, 		       5,    %d,     Fake ID (Stage 3)
 FIELD warp_id, 		       5,    %d,     Warp ID (Stage 4)
-FIELD diffInput.diff_id AS ddiff_id,       5,    %d,     ddiff_id
-FIELD diffTemplate.diff_id AS tdiff_id,    5,    %d,     tdiff_id
-# FIELD *,		       5,    %s,     Diff ID (Stage 5),		op=OP1
-# FIELD *,		       5,    %s,     Diff ID (Stage 5),		op=OP2
+FIELD diffInput.diff_id AS ddiff_id,       5,    %d,     ddiff_id, none
+FIELD diffTemplate.diff_id AS tdiff_id,    5,    %d,     tdiff_id, none
+FIELD *,		       5,    %s,     Diff ID (Stage 5),		op=OP1
+#FIELD *,		       5,    %d,     Diff ID (Stage 5),		op=OP2
 FIELD camRun.magicked, 	       5,    %d,     Cam Magicked (Stage 6)
 FIELD publishRun.pub_id,       5,    %d,     Pub ID (Stage 7)
@@ -37,4 +35,4 @@
 FIELD diffTemplate.diff_id AS tdiffId,    5,    %s,     tdiffId, 	none
 
-MODE  summary
-GROUP exp_name
+MODE summary
+GROUP rawExp.exp_id