Changeset 32694 for branches/eam_branches/ipp-20111110/ippTools/share

Timestamp:

Nov 17, 2011, 2:02:08 PM (15 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20111110

Files:

• . (modified) (1 prop)
• ippTools/share/bgtool_definechip.sql (modified) (1 diff)
• ippTools/share/camtool_find_pendingimfile.sql (modified) (1 prop)
• ippTools/share/chiptool_dropprocessedimfile_delete.sql (modified) (1 diff)
• ippTools/share/pxadmin_create_tables.sql (modified) (1 prop)

branches/eam_branches/ipp-20111110/ippTools/share/bgtool_definechip.sql

@@ -5 +5 @@
 LEFT JOIN chipBackgroundRun USING(chip_id)
 WHERE chipRun.state = 'full'
-    AND chipRun.magicked > 0 -- require destreaked to stop race condition in destreaking

branches/eam_branches/ipp-20111110/ippTools/share/chiptool_dropprocessedimfile_delete.sql

@@ -2 +2 @@
     USING magicDSRun, magicDSFile, chipRun, chipProcessedImfile
 WHERE chipRun.chip_id = chipProcessedImfile.chip_id
-    AND magicDSRun.stage ='chip' and magicDSRun.stage_id = chipRun.chip_id
-    AND magicDSFile.magic_ds_id = magicDSFile.magic_ds_id
+    AND magicDSRun.stage ='chip'
+    AND magicDSRun.stage_id = chipRun.chip_id
+    AND magicDSRun.magic_ds_id = magicDSFile.magic_ds_id
     AND magicDSFile.component = chipProcessedImfile.class_id