Changeset 16959

Timestamp:

Mar 12, 2008, 11:37:23 AM (18 years ago)

Author:

bills

Message:

changes to allow the web interface to work with pantasks sequencing
the requests

Location:

trunk/pstamp/scripts

Files:

• pstamp_get_image_job.pl (added)
• pstamp_listjobs.pl (modified) (2 diffs)
• pstamp_runcommand.sh (modified) (1 diff)
• pstamp_webrequest.pl (modified) (6 diffs)

trunk/pstamp/scripts/pstamp_listjobs.pl

@@ -2 +2 @@
 ###
 ### pstamp_listjobs.pl
-### list the job_id, state, and uri for the postage stamp jobs queued for a given 
+### list the job_id, state, and data store uri for the postage stamp jobs queued for a given 
 ### postage stamp request id
 ###
@@ -80 +80 @@
 if (! @psjobs) {
     print STDERR "no postage stamp jobs for request $request_id found\n";
-    exit 1;
+    exit 0;
 }
 
 foreach my $job (@psjobs) {
-    print "$job->{job_id} $job->{state} $job->{outputBase}.fits\n";
+    #
+    # convert from filename to data store relative uri
+    # XXX arguably we shouldn't do this here. this should be a function
+    # of the web interface. But since this script is only used by
+    # the web interface ....
+    my $i = index($job->{outputBase}, "dsroot/");
+
+    my $uri;
+    if ($i > 0) {
+        $uri = "/ds" . substr($job->{outputBase}, $i + 6) . ".fits";
+    } else {
+        $uri = "$job->{outputBase}" . ".fits";
+    }
+
+    print "$job->{job_id} $job->{state} $uri\n";
 }
 

trunk/pstamp/scripts/pstamp_runcommand.sh

@@ -65 +65 @@
 #### Finally, execute the command given by the command line arguments
 
+umask 0
+
 $*

trunk/pstamp/scripts/pstamp_webrequest.pl

@@ -42 +42 @@
                        );
 
+use Cwd;
+
 my $missing_tools;
 
@@ -54 +56 @@
 }
 
-
 # if -list is used, it must be the first argument
 my $listMode;
@@ -63 +64 @@
 }
 
-my $request_file = "request_file.$$.fits";
+my $cur_dir = getcwd();
+my $request_file = "$cur_dir/request_file.$$.fits";
 {
     my $command = "$pstamprequest $request_file @ARGV";
@@ -73 +75 @@
     }
 }
-
 
 # ok at this point we have a request file add it to the database (unless we're in listMode)
@@ -95 +96 @@
 {
 
-    my $command = "$pstamptool -addreq -uri $request_file";
+    my $command = "$pstamptool -addreq -uri $request_file -out_fileset \'pstampresults/web\$REQ_ID\'";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
         run(command => $command, verbose => $verbosity);
@@ -105 +106 @@
 }
 
-# parse the file to queue the jobs
-{
-    my $command = "$pstampparser_run $request_id";
-    my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbosity);
-    unless ($success) {
-        print STDERR @$stderr_buf;
-        die("Unable to perform pstamparser_run -addreq: $error_code");
-    }
-}
-
-#                   note: $request_id still has a newline
 print "$request_id";