Changeset 33141 for trunk/pstamp/scripts/dquery_finish.pl

Timestamp:

Jan 24, 2012, 4:40:12 PM (14 years ago)

Author:

bills

Message:

more work on detectability queries

File:

• trunk/pstamp/scripts/dquery_finish.pl (modified) (5 diffs)

trunk/pstamp/scripts/dquery_finish.pl

@@ -66 +66 @@
 if ($product eq "NULL") {
     # parsing failed just with fault = 0 (this leaves previously set fault in place
-    stop_request($req_id, 0, $verbose);
+    update_request($req_id, 0, $verbose);
     exit 0;
 }
@@ -73 +73 @@
 if (! -e $prod_dir ) {
     # something must have gone wrong at the parse stage
-    stop_request($req_id, $PS_EXIT_SYS_ERROR, $verbose);
+    update_request($req_id, $PS_EXIT_SYS_ERROR, $verbose);
     die "product directory does not exist $prod_dir";
 }
@@ -82 +82 @@
     print STDERR "output fileset directory $outdir does not exist\n" if $verbose;
     if (! mkdir $outdir ) {
-        stop_request($req_id, $PS_EXIT_SYS_ERROR, $verbose);
+        update_request($req_id, $PS_EXIT_SYS_ERROR, $verbose);
         die "cannot create output directory $outdir";
     }
 } elsif (! -d $outdir) {
-    stop_request($req_id, $PS_EXIT_SYS_ERROR, $verbose);
+    update_request($req_id, $PS_EXIT_SYS_ERROR, $verbose);
     die "output fileset directory $outdir exists but is not a directory";
 }
@@ -121 +121 @@
 
 foreach my $job (@jobs) {
+    next if $job->{parent_id};
     my $job_id = $job->{job_id};
-    my $response_file = "response${job_id}.fits";
+    my $response_file = "response.${job_id}.fits";
     my $response_path = "$outdir/$response_file";
 
@@ -157 +158 @@
 }
 
-stop_request($req_id, $request_fault, $verbose);
+update_request($req_id, $request_fault, $verbose);
 
 exit 0;
 
-sub stop_request {
+sub update_request {
     my $req_id = shift;
     my $fault = shift;
     my $verbose = shift;
     
-    my $command = "$pstamptool -updatereq -req_id $req_id -set_state stop";
-    $command   .= " -set_fault $fault" if $fault;
+    my $command = "$pstamptool -updatereq -req_id $req_id";
+    if ($fault) {
+        $command .= " -set_fault $fault";
+    } else {
+        $command .= " -set_state stop";
+    }
     $command   .= " -dbname $dbname" if $dbname;
     $command   .= " -dbserver $dbserver" if $dbserver;