Changeset 41201 for trunk/ippMonitor

Timestamp:

Dec 12, 2019, 12:41:54 PM (7 years ago)

Author:

tdeboer

Message:

small change to fullforce

Location:

trunk/ippMonitor/def

Files:

• failedFullforce.d (modified) (1 diff)
• fullforceInputSkyfile.d (modified) (1 diff)

trunk/ippMonitor/def/failedFullforce.d

@@ -4 +4 @@
 MENU  ipp.ffs.dat
 
-ARGS  ARG1 fullForceRun.ff_id=$fullForceRun.ff_id
-ARGS  ARG1 basename=$fullForceResult.path_base
+WHERE fullForceResult.fault != 0
 
-WHERE fullForceResult.fault != 0
-#        field                       size     format             name           show     link to         extras
-FIELD   fullForceRun.ff_id,             5,        %d,           FF ID
-FIELD   fullForceRun.label,             7,        %s,           Label
-FIELD   fullForceRun.state,             7,        %s,           State,     value,  failedFullforce.php, ARG1
-FIELD   warpRun.tess_id,                5,        %s,           Tess ID
-FIELD   warpRun.label AS warpRunLabel,  5,        %s,           warp Label
-FIELD   fullForceRun.data_group,        7,        %s,           data grp
-FIELD   fullForceRun.dist_group,        7,        %s,           dist grp
-FIELD   fullForceResult.fault,          7,        %d,           fault
-FIELD   fullForceResult.quality,        7,        %d,           quality
-FIELD   fullForceResult.path_base,      7,        %s,           path_base, none
+ARGS  ARG1   fullForceRun.ff_id=$fullForceRun.ff_id
+ARGS  ARG1   basename=$fullForceResult.path_base
+
+#        field                          size  format  name           show     link to         extras
+FIELD fullForceRun.ff_id,          5, %d,     FF ID
+FIELD fullForceRun.label,           7, %s,     Label
+FIELD fullForceRun.state,           7, %s,     State,           value,          fullForce_failure.php, ARG1
+FIELD warpRun.tess_id,             5, %s,     Tess ID
+FIELD warpRun.label AS warpRunLabel,   5, %s,     warp Label
+FIELD fullForceRun.data_group,      7, %s,     data grp
+FIELD fullForceRun.dist_group,      7, %s,     dist grp
+FIELD fullForceResult.fault,        7, %d,     fault
+FIELD fullForceResult.quality,      7, %d,     quality
+FIELD fullForceResult.path_base,    5, %s,     path_base,     none
 
 MODE summary
 GROUP fullForceRun.ff_id
-
-TAIL PHP insert_log ('LOG.EXP');
-

trunk/ippMonitor/def/fullforceInputSkyfile.d

@@ -1 @@
-TABLE fullForceInput, fullForceRun, warpRun
+TABLE fullForceInput JOIN fullForceRun USING (ff_id) JOIN warpRun USING (warp_id)
 TITLE Full Force Input Exposures 
 FILE  fullforceInputSkyfile.php
 MENU  ipp.ffs.dat
 
-WHERE fullForceRun.ff_id = fullForceInput.ff_id AND fullForceInput.warp_id = warpRun.warp_id
-
 #        field                          size  format  name           show     link to         extras
 FIELD fullForceRun.ff_id,          5, %s,     FF ID
-FIELD fullForceRun.label,           7, %s,     Label
-FIELD fullForceRun.state,           7, %s,     State
+FIELD fullForceRun.label,           7, %s,     Label
+FIELD fullForceRun.state,           7, %s,     State
 FIELD warpRun.warp_id,            5, %s,     Warp ID
 FIELD warpRun.tess_id,             5, %s,     Tess ID
 FIELD warpRun.label,               5, %s,     warp Label
-FIELD fullForceRun.data_group,      7, %s,     data grp
-FIELD fullForceRun.dist_group,      7, %s,     dist grp
-
+FIELD fullForceRun.data_group,      7, %s,     data grp
+FIELD fullForceRun.dist_group,      7, %s,     dist grp