Index: trunk/pstamp/web/request.php =================================================================== --- trunk/pstamp/web/request.php (revision 16283) +++ trunk/pstamp/web/request.php (revision 16358) @@ -1,23 +1,23 @@ - - - Postage Stamp Request Form - -

- - - -

-Postage Stamp Request Form -

- - -

 getMessage();
+        }
+    } else {
+        try {
+            // get the list of jobs for the request
+            // echo "calling getRequestStatus\n";
+            $jobRunning = getRequestStatus();
+
+            if (!$jobRunning) {
+                $request_id = 0;
+            }
+
+        } catch (Exception $e) {
+            $error_line = $e->getMessage();
+        }
+    }
+}
+
+function build_command_line()
+{
+    global $rvar_project, $rvar_user_tag;
+    global $sky_checked, $rsky_checked;
+    global $list_checked;
+    global $rvar_RA, $rvar_DEC;
+    global $rvar_dRA, $rvar_dDEC;
+    global $rvar_X, $rvar_Y;
+    global $rvar_W, $rvar_H;
+    global $exp_checked, $file_checked, $coord_checked;
+    global $rvar_img_type;
+    global $rvar_id, $rvar_class_id;
+    global $command_line;
+    global $STAMPS_DIR;
+
+    $cmd = "pstamp_runcommand.sh pstamp_webrequest.pl";
+    
+    if ($list_checked) {
+        $cmd .= " -list";
+    }
+
+    if (! $rvar_project ) {
+        throw new Exception('project must be specified.');
+    }
+    $cmd .= " -project $rvar_project";
+    if (! $rvar_user_tag ) {
+        throw new Exception('Stamp Name must be specified.');
+    }
+    $cmd .= " -user_tag $STAMPS_DIR/$rvar_user_tag";
+
+    // Set up the ROI parameters
+    if ($sky_checked) {
+        if (! $rvar_RA || ! $rvar_DEC) {
+            throw new Exception('RA and DEC must be specified.');
+        }
+        $cmd .= " -skycenter $rvar_RA $rvar_DEC";
+    } else {
+        if (! $rvar_X || ! $rvar_Y) {
+            throw new Exception('X and Y must be specified.');
+        }
+        $cmd .= " -pixcenter $rvar_X $rvar_Y";
+    }
+
+    if ($rsky_checked) {
+        if (! $rvar_dRA || ! $rvar_dDEC) {
+            throw new Exception('dRA and dDEC must be specified.');
+        }
+        $cmd .= " -arcrange $rvar_dRA $rvar_dDEC";
+    } else {
+        if (! $rvar_W || ! $rvar_H) {
+            throw new Exception('width and height must be specified.');
+        }
+        $cmd .= " -pixrange $rvar_W $rvar_H";
+    }
+
+
+    // Note: in the following block we assume that image type has been
+    // which is true since it comes from the menu
+    if ($exp_checked) {
+        if (! $rvar_id ) {
+            throw new Exception('Must set Exposure ID.');
+        }
+        $cmd .= " -byexp $rvar_img_type $rvar_id";
+    } else if ($file_checked) {
+        if (! $rvar_id ) {
+            throw new Exception('Must set ID specified.');
+        }
+        $cmd .= " -byid $rvar_img_type $rvar_id";
+    } else if ($coord_checked) {
+        // $cmd .= " -bycoord $rvar_img_type";
+        $coord_checked = "";
+        $exp_checked = "checked";
+        throw new Exception("Image selection by coordinate not implemented yet.");
+    }
+
+    if (($rvar_img_type == "raw") || ($rvar_img_type == "chip")) {
+        if (! $rvar_class_id ) {
+            throw new Exception("must specify Class ID with Image Type $rvar_img_type.");
+        }
+        $cmd .= " $rvar_class_id";
+    }
+
+    return escapeshellcmd($cmd);
+}
+
+function run_command()
+{
+    global $command_line;
+    global $output_array;
+    global $error_line;
+    global $command_status;
+    global $COMMAND_DIR;
+
+
+    exec ("$COMMAND_DIR/$command_line", $output_array, $command_status);
+
+    $size = sizeof($output_array);
+    // echo "output_array  contains $size lines\n";
+    if ($command_status == 0) {
+        // On success we just remember the results
+        $dump_results = 0;
+        if ($dump_results) {
+            echo "Output: $size lines\n";
+            for ($i = 0; $i < $size; $i++) {
+                echo "$output_array[$i]\n";
+            }
+        }
+    } else {
+        // copy the output to the error_line
         $error_line = "";
-        run_command();
-    } catch (Exception $e) {
-        $error_line = $e->getMessage();
+        for ($i = 0; $i < $size; $i++) {
+             $error_line .= "$output_array[$i]\n";
+        }
+    }
+
+}
+
+function printURL($line)
+{
+    global $request_id;
+    global $last_request_id;
+
+    echo "";
+    $doURL = 1;
+    if ($doURL) {
+        // echo "output_line: $line\n";
+        $elements = explode(" ", $line);
+        if (count($elements) == 3) {
+            $job_id   = $elements[0];
+            $state    = $elements[1];
+            $path     = $elements[2];
+            $fileName = basename($path);
+            if ($state == "stop") {
+                // this job is done, list the url as a link
+                echo "";
+                echo $fileName;
+                echo "";
+                echo "    request_id: $last_request_id   ";
+                echo "job_id: $job_id     state: $state";
+            } else {
+                // TODO: refine this output
+                echo "$fileName    request_id: $request_id    ";
+                echo "job_id: $job_id     state: $state";
+            }
+        }
+    } else {
+        print "$line";
+    }
+
+    echo "";
+}
+
+function countRunningJobs()
+{
+    global $output_array;
+
+    $runningJobs = 0;
+    $size = sizeof($output_array);
+    for ($i = 0; $i < $size; $i++) {
+        $elements = explode(" ", $output_array[$i]);
+        if (count($elements) == 3) {
+            $state    = $elements[1];
+            if ($state != "stop") {
+                $runningJobs++;
+            }
+        } else {
+            throw new Exception ("incorrect data in job status: $output_array[$i]");
+        }
+    }
+    return $runningJobs;
+}
+
+function getRequestStatus()
+{
+    global $request_id;
+    global $command_line;
+    global $command_status;
+
+    $command_line = "pstamp_runcommand.sh pstamp_listjobs.pl $request_id";
+    run_command();
+
+    if ($command_status == 0) {
+        return countRunningJobs();
+    } else {
+        return 0;
     }
 }
 
 ?>
-

- - + + + + + Postage Stamp Request Form + '; + + } + ?> + + + + + +

+Postage Stamp Request Form +

+ @@ -327,4 +577,7 @@

+ + + + +Request Id: $request_id"; + endif; ?> +

Mode: @@ -332,4 +585,11 @@ >List Images

@@ -361,6 +621,7 @@ - - + + + @@ -374,8 +635,11 @@ if ($command_status == 0) { if ($list_checked) { + // in list mode the output is a list of image files, just list them + // later we might add links to cause a stamp to be made from a selected file for ($i = 0; $i < $size; $i++) { echo "$output_array[$i]"; } } else { + // output the list of urls for ($i = 0; $i < $size; $i++) { printURL($output_array[$i]); @@ -387,4 +651,22 @@ + + + + + + + + > + + + > + + @@ -398,139 +680,7 @@ - -"; - $doURL = 1; - if ($doURL) { - $fileName = basename($path); - echo ""; - echo $fileName; - echo ""; - } else { - print "$path"; - } - echo ""; -} + // dump parameters + + // phpinfo(32); ?> @@ -538,3 +688,4 @@ +