Changeset 20153

Timestamp:

Oct 14, 2008, 3:34:05 PM (18 years ago)

Author:

bills

Message:

drop stamp name

File:

• trunk/pstamp/web/request.php (modified) (8 diffs)

trunk/pstamp/web/request.php

@@ -68 +68 @@
 $require_class_id = 0;
 
-$rvar_user_tag="";
 $rvar_select_by = "";
 $rvar_img_type = "";
@@ -181 +180 @@
 // HERE is the logic for running the various commands
 
-// How do we know? Well if we aren't running the initial get of the web page?
+// How do we know whether or not this is the intial page load or not?
 // Well, in that case rvar_img_type is not set so key off of that
 // TODO: find a better way to decide whether or not to run commands
@@ -205 +204 @@
                 $jobRunning = getRequestStatus();
                 if (!$jobRunning) {
+                  //   echo "1  getRequestStatus reuturned 0\n";
                     $jobFinished = 1;
                     $request_id = 0;
@@ -222 +222 @@
 
             if (!$jobRunning) {
+               //  echo "2  getRequestStatus reuturned 0\n";
                 $jobFinished = 1;
                 $request_id = 0;
@@ -239 +240 @@
 function build_request_cmd()
 {
-    global $rvar_project, $rvar_user_tag;
+    global $rvar_project;
     global $sky_checked, $rsky_checked;
     global $list_checked;
@@ -276 +277 @@
     $cmd .= " --project $rvar_project";
 
-    if (!$rvar_user_tag) {
-        if ($making_stamps) {
-            throw new Exception('Stamp Name must be specified.');
-        }
-        $cmd .= " -stamp_name temp_tag";
-    } else {
-        $cmd .= " -stamp_name $rvar_user_tag";
+    if ($making_stamps) {
+        // TODO: put options on the GUI for these
+        $cmd .= " -mask -weight";
     }
 
@@ -487 +484 @@
         $command_line .= " -dbname $dbname";
     }
+    // echo "Running $command_line\n";
+
     run_command($command_line);
     if ($command_status == 0) {
@@ -612 +611 @@
 </td>
 
-</tr>
-
-<!-- third row of table just contains a blank column followed by the user tag input -->
-<tr>
-<!-- blank label -->
-<td width=20% > </td>
-<!-- user tag input text -->
-<td>&nbsp;<b>Stamp Name:</b>&nbsp;<input type="text" name="user_tag" size=20 value=<?php echo $rvar_user_tag; ?> ></td>
 </tr>