Changeset 19334 for trunk/ippTools/share

Timestamp:

Sep 2, 2008, 2:05:26 PM (18 years ago)

Author:

bills

Message:

Add modes for transitioning chipProcessedImfiles from full to cleaned
and cleaned to full and full to purged.
Added COLUMN data_state to chipProcessedImfile to record the state.

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (1 diff)
• chiptool_change_exp_state.sql (added)
• chiptool_change_imfile_data_state.sql (added)
• chiptool_pendingcleanupimfile.sql (modified) (1 diff)
• chiptool_pendingimfile.sql (modified) (1 diff)
• pxadmin_create_tables.sql (modified) (2 diffs)

trunk/ippTools/share/Makefile.am

@@ -10 +10 @@
      camtool_reset_faulted_runs.sql \
      camtool_revertprocessedexp.sql \
+     chiptool_change_exp_state.sql \
+     chiptool_change_imfile_data_state.sql \
      chiptool_completely_processed_exp.sql \
      chiptool_donecleanup.sql \

trunk/ippTools/share/chiptool_pendingcleanupimfile.sql

@@ -14 +14 @@
 WHERE
     chipRun.state = 'goto_cleaned'
+    AND chipProcessedImfile.data_state = 'full'

trunk/ippTools/share/chiptool_pendingimfile.sql

@@ -20 +20 @@
     ON chipRun.label = chipMask.label
 WHERE
-    chipRun.state = 'new'
+    (chipRun.state = 'new'
     AND chipProcessedImfile.chip_id IS NULL
     AND chipProcessedImfile.exp_id IS NULL
     AND chipProcessedImfile.class_id IS NULL
-    AND chipMask.label IS NULL
-
--- new where logic for update.  we probably need to add a 'data_state'
--- field to chipProcessedImfile and update it (full, cleaned, etc) as
--- we cleanup or update
---    (chipRun.state = 'new'
---    AND chipProcessedImfile.chip_id IS NULL
---    AND chipProcessedImfile.exp_id IS NULL
---    AND chipProcessedImfile.class_id IS NULL
---    AND chipMask.label IS NULL) 
---    OR
---    (chipRun.state = 'update'
---    AND chipProcessedImfile.data_state = 'cleaned'
+    AND chipMask.label IS NULL)
+    OR
+    (chipRun.state = 'update'
+    AND chipProcessedImfile.data_state = 'cleaned')

trunk/ippTools/share/pxadmin_create_tables.sql

@@ -261 +261 @@
     exp_id BIGINT,
     class_id VARCHAR(64),
+    data_state VARCHAR(64),
     uri VARCHAR(255),
     bg FLOAT,
@@ -289 +290 @@
     fault SMALLINT NOT NULL,
     PRIMARY KEY(chip_id, exp_id, class_id),
+    KEY(data_state),
     KEY(fault),
     FOREIGN KEY (chip_id, exp_id)