Changeset 34393 for branches/eam_branches/ipp-20120805/ippMonitor/def/mopsStatus.d

Timestamp:

Sep 5, 2012, 3:47:31 PM (14 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20120805/ippMonitor

Files:

• . (modified) (1 prop)
• def/mopsStatus.d (modified) (4 diffs)

branches/eam_branches/ipp-20120805/ippMonitor/def/mopsStatus.d

@@ -1 @@
-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 AND (client_id=1 OR client_id=5) LEFT JOIN publishRun AS pubRun2 ON pubRun2.stage_id=diffTemplate.diff_id AND (pubRun2.client_id=1 OR pubRun2.client_id=5) LEFT JOIN magicDSRun ON magicDSRun.magic_ds_id=camRun.magicked
+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 AND (client_id=1 OR client_id=5) LEFT JOIN publishRun AS pubRun2 ON pubRun2.stage_id=diffTemplate.diff_id AND (pubRun2.client_id=1 OR pubRun2.client_id=5)
 TITLE MOPS Status
 FILE mopsStatus.php
@@ -6 +6 @@
 
 UNRESTRICTED WHERE dateobs>=DATE(NOW()) AND rawExp.obs_mode!='ENGINEERING' AND rawExp.obs_mode!='STS' AND rawExp.obs_mode!='M31' AND rawExp.obs_mode!='CNP'
+RESTRICT_COUNT WHERE dateobs>=DATE(NOW()) AND rawExp.obs_mode!='ENGINEERING' AND rawExp.obs_mode!='STS' AND rawExp.obs_mode!='M31' AND rawExp.obs_mode!='CNP'
 
 # OP  OP1   ($ddiff_id > 0 ? $ddiff_id : $tdiff_id)
@@ -12 +13 @@
 # $diffInput.diff_id+$diffTemplate.diff_id
 # PUB ID
-OP OP2 ($row[12]>$row[13]?$row[12]. "(I)":($row[13]!=0?$row[13]. "(T)":"0"))
-#($row[13]>$row[14])
+OP OP2 ($row[10]>$row[11]?$row[10]. "(I)":($row[11]!=0?$row[11]. "(T)":"0"))
+#($row[11]>$row[12])
 
 #     field                    width format  name          show         link to                   extras
@@ -20 +21 @@
 FIELD rawExp.exp_id,           5,    %d,     Exp ID
 FIELD chipRun.data_group,      5,    %s,     Data grp
-FIELD chip_id,                 5,    %d,     Chip ID (Stage 1)
-FIELD camRun.cam_id AS camID,                  5,    %d,     Cam ID (Stage 2)
-FIELD fake_id,                 5,    %d,     Fake ID (Stage 3)
-FIELD warp_id,                 5,    %d,     Warp ID (Stage 4)
+FIELD chip_id,                 5,    %d,     Chip ID (1/6)
+FIELD camRun.cam_id AS camID,                  5,    %d,     Cam ID (2/6)
+FIELD fake_id,                 5,    %d,     Fake ID (3/6)
+FIELD warp_id,                 5,    %d,     Warp ID (4/6)
 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 camRun.magicked,         5,    %d,     Magick ID (Stage 6)
-FIELD magicDSRun.magic_ds_id,       5,    %d, DestreakID (Stage 7)
+FIELD *,                       5,    %s,     Diff ID (5/6),             op=OP1
 FIELD publishRun.pub_id AS pubId1,       5,    %d,     pubId1, none
 FIELD pubRun2.pub_id AS pubId2,       5,    %d,     pubId2, none
-FIELD *,                        10, %s, Pub ID, op=OP2
+FIELD *,                        10, %s, Pub ID (6/6), op=OP2
 FIELD filter,                  5,    %s,     Filter
 FIELD object,                  15,    %s,     Object