Changeset 30585

Timestamp:

Feb 11, 2011, 3:54:07 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20101205

Files:

• . (modified) (1 prop)
• ippScripts/scripts/ipp_apply_burntool_single.pl (modified) (1 prop)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_processedimfile.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)
• ippTools/src (modified) (1 prop)
• ippTools/src/magictool.c (modified) (1 prop)
• ippconfig (modified) (1 prop)
• psLib/src/imageops (modified) (1 prop)
• psphot (modified) (1 prop)

branches/eam_branches/ipp-20101205/ippTools/share/chiptool_processedimfile.sql

@@ -30 +30 @@
     rawImfile.burntool_state,
     IFNULL(magicDSRun.magic_ds_id, 0) AS magic_ds_id,
-    magicDSRun.state AS dsRun_state,
-    magicDSFile.data_state AS dsFile_data_state
+    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