Changeset 43052 for branches/eam_branches/ipp-pstamp-20260421/pstamp/scripts/dqueryparse.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/dqueryparse.pl (modified) (11 diffs)

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

@@ -13 +13 @@
 use File::Basename;
 use File::Copy;
-use IPC::Cmd 0.36 qw( can_run run );
+use IPC::Cmd 0.36 qw( can_run );
 use Getopt::Long qw( GetOptions );
 use Pod::Usage qw( pod2usage );
@@ -21 +21 @@
 use PS::IPP::PStamp::RequestFile qw( :standard );
 use PS::IPP::PStamp::Job qw( :standard );
-use PS::IPP::Config qw( :standard );
+use PS::IPP::Config qw( :standard ps_run );
 use PS::IPP::Metadata::List qw( parse_md_list );
 
@@ -88 +88 @@
     my $command = "echo $request_file | $fields -x 0 EXTNAME EXTVER QUERY_ID";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+        ps_run(command => $command, verbose => $verbose);
     
     $fields_output = join "", @$stdout_buf;
@@ -105 +105 @@
     # set verbose to false so that error message about request not found doesn't appear in parse_error.txt
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => 0);
+        ps_run(command => $command, verbose => 0);
     if ($success) {
         # -listreq succeeded duplicate request name
@@ -112 +112 @@
         unless ($no_update) {
             my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                run(command => $command, verbose => $verbose);
+                ps_run(command => $command, verbose => $verbose);
             if (!$success) {
                 my_die("$command failed", $PS_EXIT_UNKNOWN_ERROR);
@@ -126 +126 @@
     unless ($no_update) {
         ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
+            ps_run(command => $command, verbose => $verbose);
         unless ($success) {
             my_die("$command failed", $PS_EXIT_UNKNOWN_ERROR);
@@ -151 +151 @@
     my $dqr_command = "$detect_query_read --dbname $imagedb --input $request_file";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $dqr_command, verbose => $verbose);
+        ps_run(command => $dqr_command, verbose => $verbose);
     unless ($success) {
         # This is a problem, because I'm not sure how we handle a failure to read something.
@@ -489 +489 @@
         unless ($no_update) {
             my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-                run(command => $command, verbose => $verbose);
+                ps_run(command => $command, verbose => $verbose);
             if ($success) {
                 my $job_id = join "", @$stdout_buf;
@@ -513 +513 @@
     unless ($no_update) {
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
+            ps_run(command => $command, verbose => $verbose);
         if ($success) {
             my $job_id = join "", @$stdout_buf;
@@ -534 +534 @@
     unless ($no_update) {
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
+            ps_run(command => $command, verbose => $verbose);
         unless ($success) {
         my_die("$command failed",$PS_EXIT_UNKNOWN_ERROR);
@@ -564 +564 @@
     if (!$no_update) {
         my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-            run(command => $command, verbose => $verbose);
+            ps_run(command => $command, verbose => $verbose);
         unless ($success) {
             my_die("$command failed", $PS_EXIT_UNKNOWN_ERROR);