Changeset 22430 for trunk/ippScripts/scripts/detrend_correct_imfile.pl

Timestamp:

Feb 24, 2009, 12:00:25 PM (17 years ago)

Author:

Paul Price

Message:

Adding handling for missed exceptions, similar to register_imfile.pl --- the idea is to have exceptions trigger the my_die functions so that errors are recorded in the database, and don't go on forever.

File:

• trunk/ippScripts/scripts/detrend_correct_imfile.pl (modified) (9 diffs)

trunk/ippScripts/scripts/detrend_correct_imfile.pl

@@ -24 +24 @@
 use Pod::Usage qw( pod2usage );
 
+# Look for programs we need
+my $missing_tools;
+my $dettool = can_run('dettool') or (warn "Can't find dettool" and $missing_tools = 1);
+my $dvoApplyCorr = can_run('dvoApplyCorr') or (warn "Can't find dvoApplyCorr" and $missing_tools = 1);
+if ($missing_tools) {
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
+
 my ( $det_id, $class_id, $det_type, $input_uri, $camera, $dbname,
      $verbose, $no_update, $no_op, $outroot, $redirect, $corr_uri );
@@ -43 +52 @@
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
 pod2usage( -msg => "Required options: --det_id --class_id --det_type --input_uri --camera --outroot",
-           -exitval => 3)
+           -exitval => 3)
     unless defined $det_id
     and defined $class_id
@@ -50 +59 @@
     and defined $outroot
     and defined $camera;
+
+# Unhandled exceptions should be passed on to my_die so they get pushed into the database
+$SIG{__DIE__} = sub { die @_ if $^S;
+                      my_die( $_[0], $det_id, $class_id, $PS_EXIT_UNKNOWN_ERROR ); };
 
 # XXX this exits with status = 0 on failure
@@ -60 +73 @@
 }
 
-# Recipes to use as a function of detrend type 
-# XXX there are no recipe options for dvoApplyCorr... 
+# Recipes to use as a function of detrend type
+# XXX there are no recipe options for dvoApplyCorr...
 # XXX in the future, we may define corrections other than the flat-field correction
 # $reduction = "DETREND" unless defined $reduction;
@@ -69 +82 @@
 # det_type is type of the CORRECTED (output) file
 if ($det_type ne "FLAT") { warn ("unexpected input detrend type: correcting data of type $det_type"); }
-
-# Look for programs we need
-my $missing_tools;
-my $dettool = can_run('dettool') or (warn "Can't find dettool" and $missing_tools = 1);
-my $dvoApplyCorr = can_run('dvoApplyCorr') or (warn "Can't find dvoApplyCorr" and $missing_tools = 1);
-if ($missing_tools) { 
-    warn("Can't find required tools.");
-    exit($PS_EXIT_CONFIG_ERROR); 
-}
 
 &my_die("Couldn't find input file: $input_uri\n", $det_id, $class_id, $PS_EXIT_SYS_ERROR) unless $ipprc->file_exists($input_uri);
@@ -91 +95 @@
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        &my_die("Unable to perform ppImage: $error_code", $det_id, $class_id, $error_code);
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        &my_die("Unable to perform ppImage: $error_code", $det_id, $class_id, $error_code);
     }
 
@@ -111 +115 @@
 unless ($no_update) {
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        warn("Unable to perform dettool -addcorrectimfile: $error_code\n");
-        exit($error_code);
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+        warn("Unable to perform dettool -addcorrectimfile: $error_code\n");
+        exit($error_code);
     }
 } else {
@@ -124 +128 @@
 {
     my $msg = shift; # Warning message on die
-    my $det_id = shift;         # Detrend identifier
+    my $det_id = shift;         # Detrend identifier
     my $class_id = shift; # Class identifier
     my $exit_code = shift; # Exit code to add
@@ -130 +134 @@
     carp($msg);
     if (defined $det_id and defined $class_id and not $no_update) {
-        my $command = "$dettool -addcorrectimfile";
-        $command .= " -det_id $det_id";
-        $command .= " -class_id $class_id";
-        $command .= " -path_base $outroot";
-        $command .= " -code $exit_code";
-        $command .= " -dbname $dbname" if defined $dbname;
+        my $command = "$dettool -addcorrectimfile";
+        $command .= " -det_id $det_id";
+        $command .= " -class_id $class_id";
+        $command .= " -path_base $outroot";
+        $command .= " -code $exit_code";
+        $command .= " -dbname $dbname" if defined $dbname;
         system ($command);
     }