Changeset 25320 for trunk/pstamp/scripts

Timestamp:

Sep 10, 2009, 12:00:24 PM (17 years ago)

Author:

bills

Message:

Change outputBase to include basename(path_base) in an attempt to make the stamp names
more human friendly.

File:

• trunk/pstamp/scripts/pstampparse.pl (modified) (4 diffs)

trunk/pstamp/scripts/pstampparse.pl

@@ -14 +14 @@
 use PS::IPP::PStamp::Job qw( :standard );
 use File::Temp qw(tempfile);
+use File::Basename qw(basename);
 use Carp;
 
@@ -98 +99 @@
 
 # check for duplicate request name
-if (!$no_update) {
-    my $command = "$pstamptool -listreq  -name $req_name";
+if ($req_id and !$no_update) {
+    my $command = "$pstamptool -listreq  -name $req_name -not_req_id $req_id";
     $command .= " -dbname $dbname" if $dbname;
     $command .= " -dbserver $dbserver" if $dbserver;
@@ -110 +111 @@
         insertFakeJobForRow(undef, 0, $PSTAMP_DUP_REQUEST);
         exit 0;
-    } elsif ($exitStatus ne $PS_EXIT_DATA_ERROR) {
-        # wrong error code something else is wrong
-        my_die("$command failed", $exitStatus);
     }
 }
@@ -369 +367 @@
         }
 
-        my $output_base = "$out_dir/${rownum}_${job_num}";
+        my $base = basename($image->{path_base});
+
+        my $output_base = "$out_dir/${rownum}_${job_num}_${base}";
         my $argslist = "${output_base}.args";