Changeset 24244 for branches/cnb_branches/cnb_branch_20090301/ippMonitor/def/diffInputSkyfile.d

Timestamp:

May 26, 2009, 1:59:32 PM (17 years ago)

Author:

beaumont

Message:

merged with trunk

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ippMonitor/def/diffInputSkyfile.d (modified) (1 diff)

branches/cnb_branches/cnb_branch_20090301/ippMonitor/def/diffInputSkyfile.d

@@ -1 @@
-TABLE diffInputSkyfile
+TABLE diffInputSkyfile, diffRun
 TITLE diffInputSkyfile
 FILE  diffInputSkyfile.php
 MENU  ipp.stack.dat
 
-#        field        size  format  name           show     link to         extras
-FIELD    diff_id,       20, %s,     diff ID
-FIELD    warp_id,       20, %s,     warp ID
-FIELD    skycell_id,    20, %s,     skycell ID
-FIELD    tess_id,       20, %s,     tessellation ID
-FIELD    kind,          20, %s,     Kind
-FIELD    template,      20, %s,     Template?
+WHERE diffInputSkyfile.diff_id = diffRun.diff_id
+
+#        field                            size format  name           show     link to         extras
+FIELD    diffInputSkyfile.diff_id,          5, %d,     diff ID
+FIELD    diffInputSkyfile.diff_skyfile_id,  5, %d,     skyfile ID
+FIELD    diffInputSkyfile.skycell_id,       8, %s,     skycell ID
+FIELD    diffRun.state,                     7, %s,     state
+FIELD    diffRun.label,                     7, %s,     label
+FIELD    diffRun.magicked,                  4, %d,     Magicked
+FIELD    diffInputSkyfile.warp1,            5, %d,     warp 1
+FIELD    diffInputSkyfile.stack1,           5, %d,     stack 1
+FIELD    diffInputSkyfile.warp2,            5, %d,     warp 2
+FIELD    diffInputSkyfile.stack2,           5, %d,     stack 2
+FIELD    diffInputSkyfile.tess_id,          8, %s,     tessellation ID