Changeset 25540

Timestamp:

Sep 24, 2009, 12:06:55 PM (17 years ago)

Author:

bills

Message:

if a request with a duplicate name is submitted invent a request name
and put the results there

Location:

trunk/pstamp/scripts

Files:

• pstamp_finish.pl (modified) (4 diffs)
• pstampparse.pl (modified) (4 diffs)

trunk/pstamp/scripts/pstamp_finish.pl

@@ -177 +177 @@
         my $exp_id = $job->{exp_id};
 
-        if ($fault eq $PSTAMP_DUP_REQUEST) {
+        if (($fault eq $PSTAMP_DUP_REQUEST) and ($req_name eq "NULL")) {
             # this request had a duplicate request name. We can't put the results
             # on the data store since the product name is already used
@@ -183 +183 @@
             stop_request_and_exit($req_id, $fault);
         }
-
         my ($row, $req_info, $project) = get_request_info($rows, $rownum);
 
@@ -202 +201 @@
         }
 
-        if (($job_type eq "stamp") || ($job_type eq "get_image")) {
+        if (($job_type eq "stamp") || ($job_type eq "get_image") || ($job_type eq "none")) {
             my $jreglist = "$out_dir/reglist$job_id";
             if (open JRL, "<$jreglist") {;
@@ -302 +301 @@
     my $rownum = shift;
 
+    if ($rownum eq 0) {
+        my $dummy_rowinfo = "0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|0|";
+        return (undef, $dummy_rowinfo, "none");
+    }
     my $row = $rows->{$rownum};
+
 
     # these may be set to null during processing

trunk/pstamp/scripts/pstampparse.pl

@@ -16 +16 @@
 use File::Basename qw(basename);
 use Carp;
+use POSIX qw( strftime );
 
 my $verbose;
@@ -98 +99 @@
 my_die("wrong EXTVER $extver found in $request_file_name", $PS_EXIT_PROG_ERROR) if ($extver ne "1");
 
+
 # check for duplicate request name
+my $duplicate_req_name = 0;
 if ($req_id and !$no_update) {
     my $command = "$pstamptool -listreq  -name $req_name -not_req_id $req_id";
@@ -109 +112 @@
     if ($success) {
         # -listreq succeeded duplicate request name
+        print STDERR "REQ_NAME $req_name has already been used\n";
         insertFakeJobForRow(undef, 0, $PSTAMP_DUP_REQUEST);
-        exit 0;
+        $duplicate_req_name = 1;
+        my $datestr = strftime "%Y%m%d%H%M%S.$req_id", gmtime;
+        $req_name = "ERROR.$datestr";
+        #exit 0;
     }
 }
@@ -126 +133 @@
         my_die("$command failed", $PS_EXIT_UNKNOWN_ERROR);
     }
+}
+if ($duplicate_req_name) {
+    exit 0;
 }