Changeset 34713

Timestamp:

Nov 27, 2012, 11:48:44 AM (14 years ago)

Author:

bills

Message:

Bug fixes to destreak revert camera

Location:

tags/ipp-20121026

Files:

• ippScripts/scripts/destreak_restore_camera.pl (modified) (2 diffs)
• ippTools/share/magicdstool_torevert_camera.sql (modified) (1 diff)
• psLib (modified) (1 prop)
• psLib/share (modified) (1 prop)

tags/ipp-20121026/ippScripts/scripts/destreak_restore_camera.pl

@@ -440 +440 @@
     }
 
+    my $backup_url = shift;
     my $original_url = shift;
-    my $backup_url = shift;
 
     # rename the backup as the orig
@@ -449 +449 @@
     my $moved;
     eval {
-        $moved = nebulous->move($backup_url, $original_url);
+        $moved = $nebulous->move($backup_url, $original_url);
     };
     if ($@ or not $moved) {

tags/ipp-20121026/ippTools/share/magicdstool_torevert_camera.sql

@@ -23 +23 @@
     JOIN rawExp using(exp_id)
 WHERE magicDSRun.stage = 'camera'
+    AND camProcessedExp.fault = 0
+    AND camRun.state = 'full'
     AND ((magicDSRun.state = 'new' AND magicDSFile.fault > 0)
          OR ((magicDSRun.state = 'goto_censored' OR magicDSRun.state = 'goto_restored')