Changeset 25423 for trunk/ippTools/share

Timestamp:

Sep 16, 2009, 5:05:19 PM (17 years ago)

Author:

bills

Message:

added new magicDSRun.states goto_restored and goto_censored
The 'revert' process handles processing these transitions
the end result is either 'restored' or 'cesored'
Removed torestoreMode which wasn't implemented yet

Location:

trunk/ippTools/share

Files:

• Makefile.am (modified) (2 diffs)
• magicdstool_torestore.sql (deleted)
• magicdstool_torevert_camera.sql (modified) (2 diffs)
• magicdstool_torevert_chip.sql (modified) (2 diffs)
• magicdstool_torevert_diff.sql (modified) (2 diffs)
• magicdstool_torevert_raw.sql (modified) (2 diffs)
• magicdstool_torevert_warp.sql (modified) (2 diffs)

trunk/ippTools/share/Makefile.am

@@ -173 +173 @@
      magicdstool_getrunids.sql \
      magicdstool_getskycells.sql \
+     magicdstool_revertdestreakedfile.sql \
      magicdstool_todestreak_camera.sql \
      magicdstool_todestreak_chip.sql \
@@ -179 +180 @@
      magicdstool_todestreak_warp.sql \
      magicdstool_toremove.sql \
-     magicdstool_torestore.sql \
      magicdstool_torevert_raw.sql \
      magicdstool_torevert_chip.sql \

trunk/ippTools/share/magicdstool_torevert_camera.sql

@@ -1 +1 @@
 SELECT
     magic_ds_id,
+    magicDSRun.state,
     exp_id,
     re_place,
@@ -20 +21 @@
 WHERE magicDSRun.stage = 'camera'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
-       OR magicDSRun.state = 'goto_censored'
-       OR magicDSRun.state = 'goto_restored')
+         OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
+              AND (backup_path_base IS NOT NULL)
+            )
+        )

trunk/ippTools/share/magicdstool_torevert_chip.sql

@@ -1 +1 @@
 SELECT
     magic_ds_id,
+    magicDSRun.state,
     exp_id,
     re_place,
@@ -19 +20 @@
 WHERE magicDSRun.stage = 'chip'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
-       OR magicDSRun.state = 'goto_censored'
-       OR magicDSRun.state = 'goto_restored')
+         OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
+              AND ((backup_path_base IS NOT NULL) OR (recovery_path_base IS NOT NULL))
+            )
+        )

trunk/ippTools/share/magicdstool_torevert_diff.sql

@@ -1 +1 @@
 SELECT
     magic_ds_id,
+    magicDSRun.state,
     exp_id,
     re_place,
@@ -19 +20 @@
 WHERE magicDSRun.stage = 'diff'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
-       OR magicDSRun.state = 'goto_censored'
-       OR magicDSRun.state = 'goto_restored')
+         OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
+              AND ((backup_path_base IS NOT NULL) OR (recovery_path_base IS NOT NULL))
+            )
+        )

trunk/ippTools/share/magicdstool_torevert_raw.sql

@@ -1 +1 @@
 SELECT
     magic_ds_id,
+    magicDSRun.state,
     exp_id,
     re_place,
@@ -15 +16 @@
     JOIN magicDSFile using(magic_ds_id)
     JOIN rawImfile ON (stage_id = exp_id AND component = class_id)
-    JOIN summitImfile ON (rawImfile.exp_name = summitImfile.exp_name 
-                      AND rawImfile.tmp_class_id = summitImfile.class_id)
 WHERE magicDSRun.stage = 'raw'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
-       OR magicDSRun.state = 'goto_censored'
-       OR magicDSRun.state = 'goto_restored')
+         OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
+              AND ((backup_path_base IS NOT NULL) OR (recovery_path_base IS NOT NULL))
+            )
+        )

trunk/ippTools/share/magicdstool_torevert_warp.sql

@@ -1 +1 @@
 SELECT
     magic_ds_id,
+    magicDSRun.state,
     exp_id,
     re_place,
@@ -22 +23 @@
 WHERE magicDSRun.stage = 'warp'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
-       OR magicDSRun.state = 'goto_censored'
-       OR magicDSRun.state = 'goto_restored')
+         OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
+              AND ((backup_path_base IS NOT NULL) OR (recovery_path_base IS NOT NULL))
+            )
+        )