Changeset 11316 for trunk/ippScripts/scripts/detrend_norm_calc.pl

Timestamp:

Jan 25, 2007, 7:10:31 PM (19 years ago)

Author:

Paul Price

Message:

Adding error handling; not yet tested --- there may be compilation errors.

File:

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

trunk/ippScripts/scripts/detrend_norm_calc.pl

@@ -9 +9 @@
 use PS::IPP::Metadata::List qw( parse_md_list );
 use Data::Dumper;
+
+use PS::IPP::Config qw(
+    $PS_EXIT_SUCCESS
+    $PS_EXIT_UNKNOWN_ERROR
+    $PS_EXIT_SYS_ERROR
+    $PS_EXIT_CONFIG_ERROR
+    $PS_EXIT_PROG_ERROR
+    $PS_EXIT_DATA_ERROR
+    $PS_EXIT_TIMEOUT_ERROR
+    );
 
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
@@ -54 +64 @@
 my $dettool = can_run('dettool') or (warn "Can't find dettool" and $missing_tools = 1);
 my $ppNormCalc = can_run('ppNormCalc') or (warn "Can't find ppNormCalc" and $missing_tools = 1);
-die "Can't find required tools.\n" if $missing_tools;
-
-die "Unrecognised detrend type: $detType\n" unless exists NORMALIZE()->{lc($detType)};
-
+if ($missing_tools) { 
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR); 
+}
+
+unless (exists NORMALIZE()->{lc($detType)}) {
+    warn("Unrecognised detrend type: $detType");
+    exit($PS_EXIT_CONFIG_ERROR);
+}
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -69 +84 @@
     my ( $stdin, $stdout, $stderr ); # Buffers for running program
     print "Running [$command]...\n";
-    run \@command, \$stdin, \$stdout, \$stderr or
-        die "Unable to perform dettool -processedimfile on detrend $detId/$iter: $?";
+    if (not run(\@command, \$stdin, \$stdout, \$stderr)) {
+        warn("Unable to perform dettool -processedimfile on detrend $detId/$iter: $?");
+        exit($PS_EXIT_SYS_ERROR);
+    }
 #    print $stdout . "\n";
     
@@ -82 +99 @@
             push @single, "\n";
 
-            my $list = parse_md_list( $mdcParser->parse( join( "\n", @single ) ) ) or
-                die "Unable to parse output from dettool.\n";
+            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);
+            }
             push @files, @$list;
             @single = ();
@@ -119 +139 @@
         my @command = split /\s+/, $ppNormCalc;
         print "Running [$ppNormCalc]...\n";
-        run \@command, \$normData, \$stdout, \$stderr or
-            die "Unable to perform ppNormCalc: $?";
+        if (not run(\@command, \$normData, \$stdout, \$stderr)) {
+            warn("Unable to perform ppNormCalc: $?");
+            exit($PS_EXIT_SYS_ERROR);
+        }
         print $stdout . "\n";
         
         # Parse the output
-        $norms = $mdcParser->parse($stdout)
-            or die "unable to parse metadata config doc";
+        $norms = $mdcParser->parse($stdout);
+        unless ($norms) {
+            warn("Unable to parse metadata config doc");
+            exit($PS_EXIT_PROG_ERROR);
+        }
     }
 
@@ -158 +183 @@
         my ( $stdin, $stdout, $stderr ); # Buffers for running program
         print "Running [$command]...\n";
-        run \@command, \$stdin, \$stdout, \$stderr or
-            die "Unable to perform dettool -addnormstat for $className: $?";
+        if (not run \@command, \$stdin, \$stdout, \$stderr) {
+            warn("Unable to perform dettool -addnormstat for $className: $?");
+            exit($PS_EXIT_SYS_ERROR);
+        }
         print $stdout . "\n";
     }
@@ -170 +197 @@
     $? = $status;
 }
+
+__END__