Changeset 27840 for branches/simtest_nebulous_branches/ippTools/share/magicdstool_torevert_diff.sql

Timestamp:

May 3, 2010, 8:50:52 AM (16 years ago)

Author:

eugene

Message:

updates from trunk

Location:

branches/simtest_nebulous_branches

Files:

• . (modified) (1 prop)
• ippTools/share/magicdstool_torevert_diff.sql (modified) (3 diffs)

branches/simtest_nebulous_branches/ippTools/share/magicdstool_torevert_diff.sql

@@ -1 +1 @@
 SELECT
     magic_ds_id,
+    magicDSRun.state,
     exp_id,
     re_place,
@@ -10 +11 @@
     diffSkyfile.path_base,
     "NULL" AS cam_path_base,
+    CAST(diffRun.bothways AS SIGNED) AS bothways,
     0 AS bytes,
     0 AS md5sum
@@ -16 +18 @@
     JOIN magicDSFile USING(magic_ds_id)
     JOIN diffSkyfile ON (stage_id = diffSkyfile.diff_id AND component = skycell_id)
+    JOIN diffRun ON diffSkyfile.diff_id = diffRun.diff_id
     JOIN rawExp USING(exp_id)
 WHERE magicDSRun.stage = 'diff'
-    AND (magicDSRun.state = 'new' OR magicDSRun.state = 'censored')
-    AND magicDSFile.fault > 0
+    AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
+         OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')
+              AND ((backup_path_base IS NOT NULL) OR (recovery_path_base IS NOT NULL))
+            )
+        )