Changeset 25322

Timestamp:

Sep 10, 2009, 12:07:12 PM (17 years ago)

Author:

bills

Message:

add password protection add a web page for uploading request files to the server

Location:

trunk/pstamp/web

Files:

• authenticate.php (added)
• logout.php (added)
• pstamp.php (added)
• pstampconfig.php (added)
• request.php (modified) (13 diffs)
• upload.php (added)

trunk/pstamp/web/request.php

@@ -17 +17 @@
 
 
+// XXX: change to include pstampconfig.php
+
 // BEGIN Local configuration
 
-$WORKDIR = "XXXX/pstamp-work/web";
-$dsroot = "XXXX/datastore/dsroot";
-$dbname = "XXXX";
-
-$PSCONFDIR = "XXXX";
-$PSCONFIG  = "XXXX";
+$WORKDIR = "/data/ipp049.0/pstamp/work";
+$dsroot = "/data/ipp049.0/datastore/dsroot";
+$dbname = "ippRequestServer";
+$dbserver = "ipp049";
+
+$PSCONFDIR = "/data/ipp053.0/home/bills/psconfig";
+$PSCONFIG  = "debug";
 $PSBINDIR  = "$PSCONFDIR/$PSCONFIG.lin64/bin";
 
@@ -32 +35 @@
 # $WORKDIR
 $SCRIPT    = "$PSBINDIR/pstamp_runcommand.sh $PSCONFDIR $PSCONFIG $WORKDIR";
+
+// END of moved to pstampconfig.php
 
 // Initialize variables
@@ -95 +100 @@
 import_request_variables("gp", "rvar_");
 
-if ($rvar_project == "gpc1_rel_200901") {
+if ($rvar_project == "gpc1") {
     $gpc1_selected = "selected";
     $require_class_id = 1;
@@ -255 +260 @@
     global $command_line;
     global $dbname;
+    global $dbserver;
     global $require_class_id;
     global $PSCONFDIR, $PSCONFIG, $WORKDIR;
@@ -271 +277 @@
 
     if ($dbname) {
-        $cmd .= " --dbname $dbname";
+        $cmd .= " --dbname $dbname --dbserver $dbserver";
     }
 
@@ -281 +287 @@
     if ($making_stamps) {
         // TODO: put options on the GUI for these
-        $cmd .= " -mask -weight";
+//        $cmd .= " -mask -weight";
     }
 
@@ -406 +412 @@
                 global $dsroot;
                 $dirName  = "$dsroot/$product/$req_name";
-                $filesetURL = "/ds/$product/$req_name";
+                // XXX: TODO: make this a configuration parameter
+                $filesetURL = "http://datastore.ipp.ifa.hawaii.edu/$product/$req_name";
                 $fullpath = "$dirName/$fileName";
 // echo "<pre>fullpath: $fullpath filesetURL: $filesetURL\n</pre>";
@@ -412 +419 @@
                     // this job is done, list the url as a link
                     // echo "<a href=\"http:$path\" target=\"_blank\" type=\"image/fits\">";
-                    echo "<a href=\"http:$filesetURL\">";
+                    echo "<a href=\"$filesetURL\" TARGET=\"form_results_fileset\">";
 #                    echo $fileName;
                     $filesetName = basename($dirName);
@@ -463 +470 @@
     $command_line = "$SCRIPT pstamp_listjobs.pl $request_id";
     global $dbname;
+    global $dbserver;
     if ($dbname) {
-        $command_line .= " --dbname $dbname";
+        $command_line .= " --dbname $dbname --dbserver $dbserver";
     }
 
@@ -495 +503 @@
     global $outFileset;
     global $dbname;
+    global $dbserver;
     global $SCRIPT;
 
     $command_line = "$SCRIPT pstamptool -listreq -req_id $request_id -simple";
     if ($dbname) {
-        $command_line .= " -dbname $dbname";
+        $command_line .= " -dbname $dbname -dbserver $dbserver";
     }
     // echo "Running $command_line\n";
@@ -566 +575 @@
     <tr><td><b>Project:</b>&nbsp;&nbsp;&nbsp;</td>
         <td><select name="project">
-           <option <?php echo $gpc1_selected;?> >gpc1_rel_200901
+           <option <?php echo $gpc1_selected;?> >gpc1
+<!--
            <option <?php echo $mops_selected;?> >megacam-mops
            <option <?php echo $simtest_selected;?> >simtest
+-->
         </td>
     </tr>
@@ -596 +607 @@
     <td>
         <select name="img_type">" >
-            <option <?php echo $raw_selected;?>   >raw
             <option <?php echo $chip_selected;?>  >chip
             <option <?php echo $warp_selected ;?> >warp
             <option <?php echo $stack_selected;?> >stack   
             <option <?php echo $diff_selected;?>  >diff
+            <option <?php echo $raw_selected;?>   >raw
         </select>
     </td>
@@ -611 +622 @@
 &nbsp;&nbsp;&nbsp;&nbsp;
 <b>
-<?php if (0 && $rvar_project == "gpc1_rel_200901") {
+<?php if (0 && $rvar_project == "gpc1") {
         echo "Chip ID:";
       } else {