Changeset 29085

Timestamp:

Aug 31, 2010, 2:52:30 PM (16 years ago)

Author:

bills

Message:

change the postage stamp request web form to use the new perl program psmkreq intead of the
C program pstamprequest which did not implement all of the features

Location:

trunk/pstamp/scripts

Files:

• Makefile.am (modified) (1 diff)
• psmkreq (moved) (moved from trunk/pstamp/scripts/pstamprequest )
• pstamp_webrequest.pl (modified) (4 diffs)

trunk/pstamp/scripts/Makefile.am

@@ -19 +19 @@
         pstamp_webrequest.pl \
         pstamp_get_image_job.pl \
+        psmkreq \
         pstamp_checkdependent.pl \
         request_finish.pl \

trunk/pstamp/scripts/pstamp_webrequest.pl

@@ -4 +4 @@
 # pstampwebrequest.pl: take a postage stamp request command line and process it
 #
-# The arguments are the command line parameters for the program pstamprequest
+# The arguments are the command line parameters for the program psmkreq
 #
 # Unless the argument -list is provided the output is the request id for the resulting request
@@ -70 +70 @@
 my $missing_tools;
 
-my $pstamprequest = can_run('pstamprequest')  or (warn "Can't find pstamprequest"  and $missing_tools = 1);
+my $psmkreq = can_run('psmkreq')  or (warn "Can't find psmkreq"  and $missing_tools = 1);
 my $pstamptool = can_run('pstamptool')  or (warn "Can't find pstamptool"  and $missing_tools = 1);
 my $pstampparse = can_run('pstampparse.pl')  or (warn "Can't find pstampparse.pl"  and $missing_tools = 1);
-my $pstampparser_run = can_run('pstamp_parser_run.pl')  or (warn "Can't find pstamp_parser_run.pl"  and $missing_tools = 1);
 
 if ($missing_tools) {
@@ -96 +95 @@
 my $request_file = "$datedir/$request_name.fits";
 {
-    my $command = "$pstamprequest -req_name $request_name -project $project $request_file @ARGV";
-    $command .= " -$job_type" if $job_type;     # default job_type is pstamp
+    my $command = "$psmkreq --req_name $request_name  --output $request_file @ARGV";
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
@@ -103 +101 @@
     unless ($success) {
         print STDERR @$stderr_buf;
-        die("Unable to perform pstamprequest: $error_code");
+        die("Unable to perform psmkreq: $error_code");
     }
 }