Changeset 18233

Timestamp:

Jun 20, 2008, 9:36:26 AM (18 years ago)

Author:

bills

Message:

mods to prototype web interface to support updated request file format

File:

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

trunk/pstamp/scripts/pstamp_webrequest.pl

@@ -11 +11 @@
 # the selected "input" uris are listed on stdout.
 #
-# Note: Despite the name there nothing really web specific about this program.
+# Note: Despite the name there nothing particularly web specific about this program.
 #
 ###
@@ -18 +18 @@
 use strict;
 
-my $verbosity = 0;
+use Getopt::Long qw( GetOptions );
+use Sys::Hostname;
 
-use Sys::Hostname;
 my $host = hostname();
+my $verbose = 0;
+my $dbname;
 
-if ($verbosity) {
+GetOptions(
+    'verbose'   =>  \$verbose,
+    'dbname=s'  =>  \$dbname,
+);
+
+
+
+if ($verbose) {
     print "\n\n";
     print "Starting script $0 on $host\n\n";
 }
+
 
 use IPC::Cmd 0.36 qw( can_run run );
@@ -65 +75 @@
 
 my $cur_dir = getcwd();
-my $request_file = "$cur_dir/request_file.$$.fits";
+my $request_name = "web" . get_webreq_num();
+my $request_file = "$cur_dir/$request_name.fits";
 {
-    my $command = "$pstamprequest $request_file @ARGV";
+    my $command = "$pstamprequest -request_name $request_name $request_file @ARGV";
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbosity);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
         print STDERR @$stderr_buf;
@@ -82 +93 @@
     ###
     my $command = "$pstampparse $request_file";
+    $command .= " -dbname $dbname" if $dbname;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbosity);
+        run(command => $command, verbose => $verbose);
 
     if ($success) {
@@ -98 +110 @@
 {
 
-    my $command = "$pstamptool -addreq -uri $request_file -out_fileset \'pstampresults/web\$REQ_ID\'";
+    my $command = "$pstamptool -addreq -uri $request_file -out_fileset \'pstampresults/$request_name'";
+    $command .= " -dbname $dbname" if $dbname;
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbosity);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
         print STDERR @$stderr_buf;
@@ -111 +124 @@
 
 exit 0;
+
+# Temporary hack
+# webrequest number is stored in a file in the current directory
+#
+sub get_webreq_num
+{
+    my $filename = "./webreq_num.txt";
+    if (! open IN, "+< $filename" ) {
+        my $initial_num = 1;
+        open IN, "> $filename" or die "can't open request $filename";
+        print IN "$initial_num\n" or die "failed to initialize $filename";
+        close IN;
+        return $initial_num;
+    }
+
+    my $webreq_num = <IN>;
+    chomp $webreq_num;
+
+    print STDERR "$webreq_num\n";
+
+    my $next = $webreq_num + 1;
+    truncate IN, 0;
+    seek IN, 0, 0;
+    print IN "$next\n";
+
+    close IN;
+    return $webreq_num;
+}