Changeset 25540 for trunk/pstamp/scripts/pstamp_finish.pl

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

File:

• trunk/pstamp/scripts/pstamp_finish.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