Changeset 27517 for branches/eam_branches/20100225/ippMonitor/def/distRun.d

Timestamp:

Mar 29, 2010, 3:55:49 PM (16 years ago)

Author:

eugene

Message:

update merges from trunk

Location:

branches/eam_branches/20100225

Files:

• . (modified) (1 prop)
• ippMonitor/def/distRun.d (modified) (2 diffs)

branches/eam_branches/20100225/ippMonitor/def/distRun.d

@@ -1 @@
-TABLE distRun
+TABLE distRun, distComponent
 TITLE Distribution Runs
 FILE  distRun.php
 MENU  ipp.dist.dat
 
+# the following WHERE clauses are added to all queries joined by AND
+
+WHERE distRun.dist_id = distComponent.dist_id
+
 #     field                   size  format  name         show    link to                  extras
-FIELD distRun.dist_id,        5, %s,     Dist ID
+FIELD distRun.dist_id,        5, %d,     Dist ID
 FIELD distRun.target_id,      5, %d,     Target ID
 FIELD distRun.stage,          5, %s,     Stage
@@ -14 +18 @@
 FIELD distRun.outdir,         5, %s,     Outdir
 FIELD distRun.clean,          5, %d,     Clean?
-FIELD distRun.no_magic,       5, %s,     Muggle?
+FIELD distRun.no_magic,       5, %d,     Muggle?
 FIELD distRun.state,          5, %s,     State
 FIELD distRun.time_stamp,     5, %T,     Time
-FIELD distRun.fault,          5, %d,     Fault
+FIELD distRun.fault,          5, %d,     Run Fault
+FIELD distComponent.fault,    5, %d,     Comp. Fault
 FIELD distRun.note,           5, %s,     Note