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

Timestamp:

Jun 12, 2026, 2:47:49 PM (5 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_parser_run.pl (modified) (9 diffs)

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

@@ -13 +13 @@
 use Getopt::Long qw( GetOptions );
 use File::Basename qw( basename dirname);
-use Scalar::Util qw(looks_like_number);
 use File::Copy;
 use POSIX qw( strftime );
 use Carp;
-use IPC::Cmd 0.36 qw( can_run run );
+use IPC::Cmd 0.36 qw( can_run );
 
 use PS::IPP::Metadata::Config;
@@ -23 +22 @@
 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 );
 
@@ -129 +128 @@
     # if the uri is an http uri download the file 
     my $command = "$dsget --uri $uri --filename $new_uri --timeout 120";
-    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) {
-        my_die("Unable to perform $command error code: $error_code", $req_id, $error_code);
+        my_die("Unable to perform $command error code: $error_code", $req_id, $error_code >> 8);
     }
 } elsif ($uri ne $new_uri) {
@@ -206 +204 @@
     $command   .= " -dbname $dbname" if $dbname;
     $command   .= " -dbserver $dbserver" if $dbserver;
-    my ( $success, $error_msg, $full_buf, $stdout_buf, $stderr_buf ) =
+    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbose);
-    my $error_code = &parse_error_message ($success, $error_msg, $command);
     unless ($success) {
         die("Unable to perform $command error code: $error_code");
@@ -230 +227 @@
 
     my $command = "$parse_cmd";
-    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);
 
     # save the contents of stderr (if any) to a file. This is relevant if
@@ -258 +254 @@
         }
     } else {
-        $fault = $error_code;
+        $fault = $error_code >> 8;
     }
 }
@@ -275 +271 @@
     $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");
@@ -324 +320 @@
     $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");
@@ -330 +326 @@
     exit $fault;
 }
-
-# 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);
-}
-