Changeset 43052 for branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/pstamp_finish.pl

Timestamp:

Jun 12, 2026, 2:47:49 PM (7 weeks ago)

Author:

eugene

Message:

convert the IPC::Cmd run calls to ps_run to handle inconsistent behavior between IPC:Cmd versions pre- and post-0.40

File:

• branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/pstamp_finish.pl (modified) (9 diffs)

branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/pstamp_finish.pl

@@ -12 +12 @@
 use Time::Local;
 use Sys::Hostname;
-use IPC::Cmd 0.36 qw( can_run run );
+use IPC::Cmd 0.36 qw( can_run );
 use File::Temp qw( tempfile );
 use File::Copy;
 use File::Basename qw(dirname);
-use Scalar::Util qw(looks_like_number);
 
 use PS::IPP::Metadata::Config;
@@ -22 +21 @@
 use PS::IPP::Metadata::List qw( parse_md_list );
 
-use PS::IPP::Config qw( :standard );
+use PS::IPP::Config qw( :standard ps_run );
 use PS::IPP::PStamp::RequestFile qw( :standard );
 use PS::IPP::PStamp::Job qw( :standard );
@@ -138 +137 @@
             $command   .= " -dbname $dbname" if $dbname;
             $command   .= " -dbserver $dbserver" if $dbserver;
-            my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose);
-            my $error_code = &parse_error_message ($success, $error_msg, $command);
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = ps_run($command, $verbose);
             unless ($success) {
-                die("Unable to perform $command error code: $error_code");
+                my $rc = $error_code >> 8;
+                die("Unable to perform $command error code: $rc ($error_code)");
             }
             my $output = join "", @$stdout_buf;
@@ -261 +260 @@
         {
             my $command = "$pstamp_results --input $table_def_name --output $outdir/results.fits";
-            my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) = run(command => $command, verbose => $verbose);
-            my $error_code = &parse_error_message ($success, $error_msg, $command);
+            my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) = ps_run(command => $command, verbose => $verbose);
             unless ($success) {
                 print STDERR "Unable to perform $command error code: $error_code\n";
-                $request_fault = $error_code;
+                $request_fault = $error_code >> 8;
             } else {
                 # dump a textual representation
                 my $command = "$pstampdump $outdir/results.fits > $outdir/results.mdc";
                 my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                    run(command => $command, verbose => $verbose);
+                    ps_run(command => $command, verbose => $verbose);
                 unless ($success) {
-                    $request_fault = $error_code;
+                    $request_fault = $error_code >> 8;
                     my_die("Unable to perform $command error code: $error_code", $req_id, $request_fault);
                 }
@@ -287 +285 @@
 
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
+            ps_run(command => $command, verbose => $verbose);
         unless ($success) {
-            $request_fault = $error_code;
+            $request_fault = $error_code >> 8;
             my_die("Unable to perform $command error code: $error_code\n", $req_id, $request_fault);
         }
@@ -299 +297 @@
         $command   .= " -dbserver $dbserver" if $dbserver;
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
+            ps_run(command => $command, verbose => $verbose);
         unless ($success) {
             die("Unable to perform $command error code: $error_code");
@@ -319 +317 @@
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+        ps_run(command => $command, verbose => $verbose);
     unless ($success) {
         die("Unable to perform $command error code: $error_code");
@@ -435 +433 @@
             # run the tool and parse the output
             my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                        run(command => $command, verbose => $verbose);
+                        ps_run(command => $command, verbose => $verbose);
             unless ($success) {
                 # not sure if we should die here
@@ -506 +504 @@
     return 40587.0 + ($ticks/86400.);
 }
-
-# if the program exited normally, the exit value is returned
-# if the program exited with a signal (abort, crash, etc), PS_EXIT_PROG_ERROR (4) is returned
-# if the program failed to run, -PS_EXIT_PROG_ERROR (-4) is returned
-sub parse_error_message {
-    my $success = shift;
-    my $error_msg = shift;
-    my $command = shift;
-
-    if ($success) { return 0; }
-
-    print "raw error_msg: $error_msg\n";
-    print "full command: $command\n";
-
-    if (&looks_like_number($error_msg)) { return (($error_msg >> 8) or ($PS_EXIT_PROG_ERROR)); }
-        
-    # which of these match?
-    my ($error_code) = $error_msg =~ m/exited with value (\d+)/;
-    if (defined $error_code) { return $error_code; }
-    
-    ($error_code) = $error_msg =~ m/died with signal (\d+)/;
-#   if (defined $error_code) { return (128 + $error_code); }
-    if (defined $error_code) { return ($PS_EXIT_PROG_ERROR); }
-    
-    # probably failed to execute:
-    return (-1*$PS_EXIT_PROG_ERROR);
-}