Changeset 27738 for trunk/ippTools/share

Timestamp:

Apr 23, 2010, 11:20:24 AM (16 years ago)

Author:

bills

Message:

Add -listrun mode.
Fix handling of magicked bits during update.
Various other changes to the 'list' modes to support the postage stamp server

Location:

trunk/ippTools/share

Files:

• chiptool_change_imfile_data_state.sql (modified) (1 diff)
• chiptool_listrun.sql (added)
• chiptool_pendingcleanupimfile.sql (modified) (1 diff)
• chiptool_pendingimfile.sql (modified) (1 diff)
• chiptool_processedimfile.sql (modified) (2 diffs)

trunk/ippTools/share/chiptool_change_imfile_data_state.sql

@@ -3 +3 @@
 -- chip_id and class_id
 UPDATE chipProcessedImfile
+JOIN chipRun USING(chip_id, exp_id)
 JOIN rawImfile USING(exp_id, class_id)
     SET 

trunk/ippTools/share/chiptool_pendingcleanupimfile.sql

@@ -13 +13 @@
     USING(chip_id)
 WHERE
-    ((chipRun.state = 'goto_cleaned' AND chipProcessedImfile.data_state = 'full')
+    ((chipRun.state = 'goto_cleaned' AND (chipProcessedImfile.data_state = 'full'
+                                       OR chipProcessedImfile.data_state = 'update'))
 OR 
-    (chipRun.state = 'goto_scrubbed' AND chipProcessedImfile.data_state = 'full')
+    (chipRun.state = 'goto_scrubbed' AND chipProcessedImfile.data_state != 'scrubbed')
 OR 
     (chipRun.state = 'goto_purged' AND chipProcessedImfile.data_state != 'purged'))

trunk/ippTools/share/chiptool_pendingimfile.sql

@@ -33 +33 @@
     OR
     (chipRun.state = 'update'
-    AND chipProcessedImfile.data_state = 'update'))
--- // Restriction to prevent the processing of bad chips. Not needed now.
---     AND
---     (rawImfile.class_id != 'XY15' AND
---     rawImfile.class_id != 'XY32' AND
---     rawImfile.class_id != 'XY45')
-
+    AND chipProcessedImfile.data_state = 'update'
+    AND chipProcessedImfile.fault = 0))

trunk/ippTools/share/chiptool_processedimfile.sql

@@ -22 +22 @@
     rawExp.camera,
     rawExp.telescope,
-    rawExp.filelevel
+    rawExp.filelevel,
+    rawImfile.magicked AS raw_magicked,
+    rawImfile.burntool_state,
+    magicDSRun.state AS dsRun_state
 FROM chipRun
 JOIN chipImfile
@@ -30 +33 @@
 JOIN rawExp
     ON chipProcessedImfile.exp_id = rawExp.exp_id
+JOIN rawImfile
+    ON rawExp.exp_id = rawImfile.exp_id 
+    AND chipProcessedImfile.class_id = rawImfile.class_id
+LEFT JOIN magicDSRun
+    ON stage_id = chip_id AND stage = 'chip' AND magicDSRun.re_place