Changeset 23295 for trunk/ippScripts/scripts/register_imfile.pl

Timestamp:

Mar 12, 2009, 11:38:13 AM (17 years ago)

Author:

Paul Price

Message:

Set error code to PROG_ERROR if not already set --- avoids infinite pantasks loops.

File:

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

trunk/ippScripts/scripts/register_imfile.pl

@@ -94 +94 @@
     print "STDOUT:\n$out1";
     print "STDERR:\n$err1";
-    &my_die("Unable to perform ppStats on exposure id $exp_id: " . $h1->result(), $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $h1->result() ) unless $result1;
+    &my_die("Unable to perform ppStats on exposure id $exp_id: " . $h1->result(), $exp_id, $tmp_exp_name, $tmp_class_id, $uri, ($h1->result() or $PS_EXIT_PROG_ERROR) ) unless $result1;
 
     print "[Running " . join(' ', @command2) . "]\n";
@@ -103 +103 @@
     print "STDOUT:\n$out2";
     print "STDERR:\n$err2";
-    &my_die("Unable to perform ppStatsFromMetadata on exposure id $exp_id: " . $h2->result(), $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $h2->result() ) unless $result2;
+    &my_die("Unable to perform ppStatsFromMetadata on exposure id $exp_id: " . $h2->result(), $exp_id, $tmp_exp_name, $tmp_class_id, $uri, ($h2->result() or $PS_EXIT_PROG_ERROR) ) unless $result2;
     chomp $out2;
     $cmdflags = $out2;
@@ -128 +128 @@
 
 # determine solar-system parameters
-my $longitude = &value_for_flag ($cmdflags, "-longitude");
-my $latitude  = &value_for_flag ($cmdflags, "-latitude");
-my $elevation = &value_for_flag ($cmdflags, "-elevation");
-my $ra        = &value_for_flag ($cmdflags, "-ra");
-my $dec       = &value_for_flag ($cmdflags, "-decl");
-my $dateobs   = &value_for_flag ($cmdflags, "-dateobs");
+my $longitude = &value_for_flag($cmdflags, "-longitude");
+my $latitude  = &value_for_flag($cmdflags, "-latitude");
+my $elevation = &value_for_flag($cmdflags, "-elevation");
+my $ra        = &value_for_flag($cmdflags, "-ra");
+my $dec       = &value_for_flag($cmdflags, "-decl");
+my $dateobs   = &value_for_flag($cmdflags, "-dateobs");
 
 # if the needed data is available, pass it to sunmoon:
@@ -212 +212 @@
 
     # for failed imfiles, we insert UNKNOWN for inst, telescope, class_id
+
+    $exit_code = $PS_EXIT_PROG_ERROR unless defined $exit_code;
 
     carp($msg);