Changeset 11316 for trunk/ippScripts/scripts/phase3.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/phase3.pl (modified) (7 diffs)

trunk/ippScripts/scripts/phase3.pl

@@ -12 +12 @@
 use Statistics::Descriptive;
 
-use PS::IPP::Config;
+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
+    );
 my $ipprc = PS::IPP::Config->new(); # IPP configuration
 use File::Spec;
@@ -45 +53 @@
 my $p3tool = can_run('p3tool') or (warn "Can't find p3tool" and $missing_tools = 1);
 my $ppImage = can_run('ppImage') or (warn "Can't find ppImage" and $missing_tools = 1);
-die "Can't find required tools.\n" if $missing_tools;
+if ($missing_tools) { 
+    warn("Can't find required tools.");
+    exit($PS_EXIT_CONFIG_ERROR); 
+}
 
 my $mdcParser = PS::IPP::Metadata::Config->new; # Parser for metadata config files
@@ -56 +67 @@
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
-    die "Unable to perform p3tool -pendingimfile: $error_code\n" if not $success;
-    my $metadata = $mdcParser->parse(join "", @$stdout_buf) 
-        or die "unable to parse metadata config doc";
-    $files = parse_md_list($metadata);
+    unless ($success) {
+        $error_code >> 8;
+        &my_die("Unable to perform p3tool: $error_code", $exp_tag, $error_code);
+    }
+    my $metadata = $mdcParser->parse(join "", @$stdout_buf) or
+        &my_die("Unable to parse metadata config doc", $exp_tag, $PS_EXIT_PROG_ERROR);
+    $files = parse_md_list($metadata) or
+        &my_die("Unable to parse metadata list", $exp_tag, $PS_EXIT_PROG_ERROR);
 }
 
@@ -74 +89 @@
 #    my @zp;                    # Array of photometric zero points
     foreach my $file (@$files) {
-        die "Unable to find class id\n" unless defined $file->{class_id};
+        &my_die("Unable to find class id", $exp_tag, $PS_EXIT_SYS_ERROR) unless defined $file->{class_id};
         my $class_id = $file->{class_id};
-        die "Unable to find bg for class_id=$class_id\n" unless defined $file->{bg};
-        die "Unable to find bg_mean_stdev for class_id=$class_id\n" unless defined $file->{bg_mean_stdev};
-#       die "Unable to find sigma_ra for class_id=$class_id\n" unless defined $file->{sigma_ra};
-#       die "Unable to find sigma_dec for class_id=$class_id\n" unless defined $file->{sigma_dec};
-#       die "Unable to find zp for class_id=$class_id\n" unless defined $file->{zp};
+        &my_die("Unable to find bg for class_id=$class_id", $exp_tag, $PS_EXIT_SYS_ERROR) unless defined $file->{bg};
+        &my_die("Unable to find bg_mean_stdev for class_id=$class_id", $exp_tag, $PS_EXIT_SYS_ERROR) unless defined $file->{bg_mean_stdev};
+#       &my_die("Unable to find sigma_ra for class_id=$class_id", $exp_tag, $PS_EXIT_SYS_ERROR) unless defined $file->{sigma_ra};
+#       &my_die("Unable to find sigma_dec for class_id=$class_id", $exp_tag, $PS_EXIT_SYS_ERROR) unless defined $file->{sigma_dec};
+#       &my_die("Unable to find zp for class_id=$class_id", $exp_tag, $PS_EXIT_SYS_ERROR) unless defined $file->{zp};
         push @backgrounds, $file->{bg};
         push @variances, $file->{bg_stdev}**2;
@@ -132 +147 @@
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
-    die "Unable to find expected output file: $jpeg1\n" if not -f $jpeg1;
+    unless ($success) {
+        $error_code >> 8;
+        &my_die("Unable to perform ppImage: $error_code", $exp_tag, $error_code);
+    }
+    &my_die("Unable to find expected output file: $jpeg1", $exp_tag, $PS_EXIT_PROG_ERROR) unless -f $jpeg1;
 }
 
@@ -140 +159 @@
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
-    die "Unable to find expected output file: $jpeg2\n" if not -f $jpeg2;
+    unless ($success) {
+        $error_code >> 8;
+        &my_die("Unable to perform ppImage: $error_code", $exp_tag, $error_code);
+    }
+    &my_die("Unable to find expected output file: $jpeg2", $exp_tag, $PS_EXIT_PROG_ERROR) unless -f $jpeg2;
 }
 
@@ -156 +179 @@
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => 1);
-    die "Unable to perform p3tool -addprocessedexp: $error_code\n" if not $success;
+    unless ($success) {
+        $error_code >> 8;
+        warn("Unable to perform dettool -addprocessedexp: $error_code\n");
+        exit($error_code);
+    }
 
     unlink $list1Name;
     unlink $list2Name;
 }
+
+
+sub my_die
+{
+    my $msg = shift; # Warning message on die
+    my $exp_tag = shift; # Exposure tag
+    my $exit_code = shift; # Exit code to add
+
+    warn($msg);
+    if ($exp_tag) {
+        my $command = "$dettool -addprocessedexp -exp_tag $exp_tag -code $exit_code";
+        $command .= " -dbname $dbname" if defined $dbname;
+        system ($command);
+    }
+    exit $exit_code;
+}
+
 
 END {