Changeset 30566

Timestamp:

Feb 11, 2011, 12:23:06 PM (15 years ago)

Author:

bills

Message:

add magicDSFile.state to outputs

Location:

trunk/ippTools/share

Files:

• chiptool_processedimfile.sql (modified) (2 diffs)
• warptool_scmap.sql (modified) (1 diff)

trunk/ippTools/share/chiptool_processedimfile.sql

@@ -29 +29 @@
     rawImfile.magicked AS raw_magicked,
     rawImfile.burntool_state,
+    IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id,
     magicDSRun.state AS dsRun_state,
-    IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id
+    magicDSFile.data_state AS dsFile_data_state
 FROM chipRun
 JOIN chipImfile
@@ -43 +44 @@
 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

trunk/ippTools/share/warptool_scmap.sql

@@ -12 +12 @@
     IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id,
     IFNULL(magicDSRun.state, 0) AS dsRun_state,
+    IFNULL(magicDSFile.data_state, 0) AS dsFile_data_state,
     IFNULL(magicDSFile.fault, 0) as dsFile_fault
 FROM warpRun