Changeset 16959 for trunk/pstamp/scripts/pstamp_webrequest.pl

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

File:

• trunk/pstamp/scripts/pstamp_webrequest.pl (modified) (6 diffs)

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";