Changeset 30587 for branches/czw_branch/20101203/ippTools/share/chiptool_processedimfile.sql

Timestamp:

Feb 11, 2011, 4:42:29 PM (15 years ago)

Author:

watersc1

Message:

Caught up with the trunk. Now to look for bugs.

Location:

branches/czw_branch/20101203

Files:

• . (modified) (1 prop)
• ippTools/share/chiptool_processedimfile.sql (modified) (2 diffs)

branches/czw_branch/20101203/ippTools/share/chiptool_processedimfile.sql

@@ -29 +29 @@
     rawImfile.magicked AS raw_magicked,
     rawImfile.burntool_state,
-    magicDSRun.state AS dsRun_state,
-    IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id
+    IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id,
+    IFNULL(magicDSRun.state,0) AS dsRun_state,
+    IFNULL(magicDSFile.fault,0) AS dsFile_fault,
+    IFNULL(magicDSFile.data_state,0) AS dsFile_data_state
 FROM chipRun
 JOIN chipImfile
@@ -43 +45 @@
 LEFT JOIN magicDSRun
     ON stage_id = chip_id AND stage = 'chip' AND magicDSRun.re_place AND magicDSRun.state != 'drop'
+LEFT JOIN magicDSFile ON magicDSRun.magic_ds_id = magicDSFile.magic_ds_id AND chipProcessedImfile.class_id = magicDSFile.component