Changeset 11831

Timestamp:

Feb 15, 2007, 10:45:58 AM (19 years ago)

Author:

Paul Price

Message:

Adding die function to add error code.

File:

• trunk/ippScripts/scripts/detrend_norm_calc.pl (modified) (6 diffs)

trunk/ippScripts/scripts/detrend_norm_calc.pl

@@ -77 +77 @@
 }
 
-unless (exists NORMALIZE()->{lc($detType)}) {
-    warn("Unrecognised detrend type: $detType");
-    exit($PS_EXIT_CONFIG_ERROR);
-}
+&my_die("Unrecognised detrend type: $detType", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless
+    exists NORMALIZE()->{lc($detType)};
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -93 +91 @@
     print "Running [$command]...\n";
     if (not run(\@command, \$stdin, \$stdout, \$stderr)) {
-        warn("Unable to perform dettool -processedimfile on detrend $detId/$iter: $?");
-        exit($PS_EXIT_SYS_ERROR);
+        &my_die("Unable to perform dettool -processedimfile on detrend $detId/$iter: $?",
+                $det_id, $iter, $PS_EXIT_SYS_ERROR);
     }
 #    print $stdout . "\n";
@@ -108 +106 @@
 
             my $list = parse_md_list( $mdcParser->parse( join( "\n", @single ) ) );
-            unless (defined $list) {
-                warn("Unable to parse output from dettool.");
-                exit($PS_EXIT_PROG_ERROR);
-            }
+            &my_die("Unable to parse output from dettool", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless
+                defined $list;
             push @files, @$list;
             @single = ();
@@ -148 +144 @@
         print "Running [$ppNormCalc]...\n";
         if (not run(\@command, \$normData, \$stdout, \$stderr)) {
-            warn("Unable to perform ppNormCalc: $?");
-            exit($PS_EXIT_SYS_ERROR);
+            &my_die("Unable to perform ppNormCalc: $?", $det_id, $iter, $PS_EXIT_SYS_ERROR);
         }
         print $stdout . "\n";
@@ -155 +150 @@
         # Parse the output
         $norms = $mdcParser->parse($stdout);
-        unless ($norms) {
-            warn("Unable to parse metadata config doc");
-            exit($PS_EXIT_PROG_ERROR);
-        }
+        &my_die("Unable to parse metadata config doc", $det_id, $iter, $PS_EXIT_PROG_ERROR) unless $norms;
     }
 
@@ -199 +191 @@
 }
 
+sub my_die
+{
+    my $msg = shift;            # Warning message on die
+    my $det_id = shift;         # Detrend identifier
+    my $iter = shift;           # Iteration
+    my $exit_code = shift;      # Exit code to add
+
+    warn($msg);
+    if ($det_id and $iter and $class_id and not $no_update) {
+        my $command = "$dettool -addnormalizedstat -det_id $det_id -iteration $iter -code $exit_code";
+        $command .= " -dbname $dbname" if defined $dbname;
+        system ($command);
+    }
+    exit $exit_code;
+}
+
+
 END {
     my $status = $?;