Changeset 23352 for branches/cnb_branches/cnb_branch_20090301/ippScripts/scripts/register_imfile.pl

Timestamp:

Mar 17, 2009, 12:08:50 PM (17 years ago)

Author:

beaumont

Message:

merged with head

Location:

branches/cnb_branches/cnb_branch_20090301

Files:

• . (modified) (1 prop)
• ippScripts/scripts/register_imfile.pl (modified) (7 diffs)

branches/cnb_branches/cnb_branch_20090301/ippScripts/scripts/register_imfile.pl

@@ -23 +23 @@
 use Math::Trig;
 
-my $ipprc = PS::IPP::Config->new(); # IPP configuration
 use File::Spec;
 
@@ -49 +48 @@
 ) or pod2usage( 2 );
 
-# 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], $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_UNKNOWN_ERROR ); };
-
-$ipprc->redirect_output($logfile) if $logfile;
+my $ipprc = PS::IPP::Config->new() or my_die( "Unable to set up", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_CONFIG_ERROR ); # IPP configuration
+$ipprc->redirect_output($logfile) or my_die( "Unable to redirect output", $exp_id, $tmp_exp_name, $tmp_class_id, $uri, $PS_EXIT_SYS_ERROR ) if $logfile;
 
 pod2usage( -msg => "Unknown option: @ARGV", -exitval => 2 ) if @ARGV;
@@ -98 +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";
@@ -107 +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;
@@ -132 +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:
@@ -216 +212 @@
 
     # for failed imfiles, we insert UNKNOWN for inst, telescope, class_id
+
+    $exit_code = $PS_EXIT_PROG_ERROR unless defined $exit_code;
 
     carp($msg);
@@ -230 +228 @@
         $command .= " -hostname $host" if defined $host;
         $command .= " -dbname $dbname" if defined $dbname;
-        system ($command);
+        print "Running: $command\n";
+        system($command);
     }
     exit $exit_code;