Changeset 23197 for branches/cnb_branches/cnb_branch_20090215/ippScripts/scripts/register_imfile.pl

Timestamp:

Mar 5, 2009, 11:13:29 AM (17 years ago)

Author:

beaumont

Message:

Finished ppStack visualization. Unified the way in which visualizations are invoked, plotting windows are closed, etc

Location:

branches/cnb_branches/cnb_branch_20090215

Files:

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

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

@@ -17 +17 @@
 use Storable qw(freeze thaw);
 use File::Basename qw( basename);
-use IPC::Run qw( harness run );
+use IPC::Run;
+use IPC::Cmd 0.36 qw( can_run );
 use PS::IPP::Config 1.01 qw( :standard );
 use PS::IPP::Metadata::Config;
@@ -27 +28 @@
 use Getopt::Long qw( GetOptions :config auto_help auto_version gnu_getopt );
 use Pod::Usage qw( pod2usage );
+
+# Look for programs we need
+my $missing_tools;
+my $regtool = can_run( 'regtool' ) or (warn "Can't find regtool" and $missing_tools = 1);
+my $ppStats = can_run( 'ppStats' ) or (warn "Can't find ppStats" and $missing_tools = 1);
+my $ppStatsFromMetadata = can_run( 'ppStatsFromMetadata' ) or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
 
 my ($cache, $exp_id, $tmp_class_id, $tmp_exp_name, $uri, $dbname, $verbose, $no_update, $no_op, $logfile);
@@ -42 +49 @@
 ) 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;
 
@@ -55 +66 @@
 my $RECIPE = "REGISTER"; # Recipe to use for ppStats
 
-# Look for programs we need
-my $missing_tools;
-my $regtool = `which regtool` or (warn "Can't find regtool" and $missing_tools = 1);
-my $ppStats = `which ppStats` or (warn "Can't find ppStats" and $missing_tools = 1);
-my $ppStatsFromMetadata = `which ppStatsFromMetadata` or (warn "Can't find ppStatsFromMetadata" and $missing_tools = 1);
-chomp $regtool;
-chomp $ppStats;
-chomp $ppStatsFromMetadata;
-
-
 if ($missing_tools) {
     warn ("Can't find required tools");
@@ -92 +93 @@
     # Run ppStats
     my ($in1, $out1, $err1);    # Buffers for ppStats
-    my $h1 = harness \@command1, \$in1, \$out1, \$err1;
+    my $h1 = IPC::Run::harness \@command1, \$in1, \$out1, \$err1;
     print "[Running $command1]\n";
-    my $result1 = run $h1;
-    print $out1;
-    print $err1;
+    my $result1 = IPC::Run::run $h1;
+    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;
 
     print "[Running " . join(' ', @command2) . "]\n";
     my ($out2, $err2);          # Buffers for ppStatsFromMetadata
-    my $h2 = harness \@command2, \$out1, \$out2, \$err2;
+    my $h2 = IPC::Run::harness \@command2, \$out1, \$out2, \$err2;
     print "[Running $command2]\n";
-    my $result2 = run $h2;
-    print $out2;
-    print $err2;
+    my $result2 = IPC::Run::run $h2;
+    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;
     chomp $out2;
@@ -166 +167 @@
 unless ($no_update) {
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+        IPC::Cmd::run(command => $command, verbose => $verbose);
     unless ($success) {
         $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
@@ -187 +188 @@
         return @{thaw $cmd_output};
     } else {
-        my @output = run(%p);
+        my @output = IPC::Cmd::run(%p);
         $c->set($p{command}, freeze \@output) if $cache;
         return @output;