Changeset 29625 for trunk/ippScripts/scripts/magic_process.pl

Timestamp:

Nov 1, 2010, 12:51:37 PM (16 years ago)

Author:

bills

Message:

When processing root node, insert the streaks object before the node result.
Change -addmask to not set magicRun.state to full. Do that in addresult
if node == 'root' and fault == 0. In revert delete mask objects if the
associted root node is faulted.

File:

• trunk/ippScripts/scripts/magic_process.pl (modified) (4 diffs)

trunk/ippScripts/scripts/magic_process.pl

@@ -325 +325 @@
 }
 
-### Input result into database
-{
-    my $command = "$magictool -addresult";
-    $command   .= " -magic_id $magic_id";
-    $command   .= " -node $node";
-    $command   .= " -path_base $outroot";
-    $command   .= " -dbname $dbname" if defined $dbname;
-
-    # Add the processed file to the database
-    unless ($no_update) {
-        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
-        unless ($success) {
-            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-            &my_die("Unable to perform magictool -addresult: $error_code", $magic_id, $node, $error_code);
-        }
-    } else {
-        print "Skipping command: $command\n";
-    }
-}
 
 if ($node eq "root") {
@@ -376 +356 @@
         my $exposures = $mdcParser->parse_list(join "", @$stdout_buf);
         my $exp = $$exposures[0]; # Exposure of interest (should only be one)
+        if (!$exp) {
+            &my_die("magictool -exposure returned no output", $magic_id, $node, $PS_EXIT_UNKNOWN_ERROR);
+        }
 
         $exp_id = $exp->{exp_id};
@@ -429 +412 @@
             unless ($success) {
                 $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-                # XXX: This my_die isn't going to work because the result for the root node was already
-                # added to the database up above.
-                # There is a magicMask has a fault column. Maybe we should 
-                # use that and add a new revert mode that deletes the magicMask and the magicNodeResult
-                # for the root node.
                 &my_die("Unable to perform magictool -addmask: $error_code", $magic_id, $node, $error_code);
             }
@@ -439 +417 @@
             print "Skipping command: $command\n";
         }
+    }
+}
+
+    ### Input result into database
+{
+    my $command = "$magictool -addresult";
+    $command   .= " -magic_id $magic_id";
+    $command   .= " -node $node";
+    $command   .= " -path_base $outroot";
+    $command   .= " -dbname $dbname" if defined $dbname;
+
+    # Add the processed file to the database
+    unless ($no_update) {
+        my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
+            run(command => $command, verbose => $verbose);
+        unless ($success) {
+            $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+            # XXX: if this is the root node we need to revert delete the magicMask object
+            # inserted above
+            &my_die("Unable to perform magictool -addresult: $error_code", $magic_id, $node, $error_code);
+        }
+    } else {
+        print "Skipping command: $command\n";
     }
 }