Index: /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/authenticate.php =================================================================== --- /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/authenticate.php (revision 42993) +++ /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/authenticate.php (revision 42994) @@ -3,9 +3,15 @@ // function check_login() +$lifetime=86400; session_start(); +setcookie(session_name(),session_id(),time()+$lifetime); +ini_set('session.gc_maxlifetime', 86400); // XXX TODO use mysql -$auth_user="setme"; -$auth_passwd="setmetoo"; +$auth_user="SET_ME"; +$auth_passwd="SET_ME"; + +$alt_user="SET_ME"; +$alt_passwd="SET_ME"; $user = $_SERVER['PHP_AUTH_USER']; @@ -13,12 +19,14 @@ $did_login = isset($_SESSION['did_login']); -if ($did_login && isset($user) && isset($passwd) && - ($auth_user == $user) && ($auth_passwd == $passwd)) { +# uncomment this to skipp authentication +$skip_login = 0; - echo "Welcome: " . $user; - echo "    Logout"; - echo "
"; - echo "
"; -} else { +$valid_pwd = 0; +if ($did_login && isset($user) && isset($passwd)) { + $valid_pwd = $valid_pwd || (($auth_user == $user) && ($auth_passwd == $passwd)); + $valid_pwd = $valid_pwd || (($alt_user == $user) && ($alt_passwd == $passwd)); + } + +if (!$skip_login && !$valid_pwd) { $_SESSION['did_login'] = true; header('WWW-Authenticate: Basic realm="Restricted Section"'); @@ -31,3 +39,27 @@ ?> +
"; + echo "   "; + echo "Logout"; + echo "   \n"; + if ($link) { + echo "$text"; + } + include "pstamp_links.php"; + echo "

"; + // Top of the page is the contents of the "message of the day file" + // This can be empty but must exist or the user sees an error. + $motd_filename = "pstamp_motd.html"; + $file = fopen($motd_filename, "r"); + if ($file) { + fpassthru($file); + } + +// echo "
"; +// echo "
"; +} +?> Index: /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/dsroot.php =================================================================== --- /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/dsroot.php (revision 42994) +++ /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/dsroot.php (revision 42994) @@ -0,0 +1,101 @@ + + + + + + Links to the IPP data store + + + + +

+IPP DataStore +

+ +\n"; +echo "The page will NOW refresh in 20 mins"; +$dbserver = dblogin(); + +$query = "SELECT prod_name, last_fs, last_update, type, description FROM dsProduct ORDER BY type, prod_id"; +$result = mysqli_query($dbserver, $query); +if (!$result) { + die("Database access failed: " . mysqli_error($dbserver)); +} + +echo ""; +echo "\n"; + +$rows = mysqli_num_rows($result); + +for ($i = 0; $i < $rows; $i++) { + $row = mysqli_fetch_row($result); + echo ""; + $prod_name = $row[0]; + echo ""; + + $last_fs = $row[1]; + echo "\n"; + + $time_reg = $row[2]; + list($reg_date, $reg_time) = sscanf($time_reg, "%s %s"); + echo ""; + + $type = $row[3]; + echo ""; + $description = $row[4]; + echo ""; + echo "\n"; + +} +echo "
productIDMost recent Time registeredtype Description
"; + // echo "$prod_name"; + //$prod_link = "http://datastore.ipp.ifa.hawaii.edu/$prod_name"; + $prod_link = "http://datastore.ipp.ifa.hawaii.edu/ds/$prod_name"; + + // $prod_link "$prod_name"; + echo "$prod_name"; + + echo ""; + if ($last_fs && ($last_fs != "none")) { + echo "$last_fs"; + } else { + echo "none"; + } + echo "" . $reg_date . "T" . $reg_time . "Z" . "$type$description
\n"; + + +// BEGIN debugging area + +// print lots of information +// phpinfo(-1); +// print the most useful variables +// phpinfo(32); + +echo ""; + +?> Index: /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/logout.php =================================================================== --- /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/logout.php (revision 42993) +++ /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/logout.php (revision 42994) @@ -7,12 +7,17 @@ $_SESSION = array(); if (isset($_COOKIE[session_name()])) { - setcookie(session_name(), '', time()-42000, '/'); + setcookie(session_name(), '', time()+3600, '/'); } session_destroy(); echo "You are now logged out

"; -echo "Upload"; -// phpinfo(32); ?> +Postage Stamp Home +
+
+ Index: /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/request.php =================================================================== --- /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/request.php (revision 42993) +++ /branches/eam_branches/ipp-pstamp-20260421/pstamp/web/request.php (revision 42994) @@ -14,5 +14,6 @@ // The mode for the page is given by $request_id != 0 -// XXX This is just a prototype for testing purposes. +// XXX This was intended to just be a prototype for testing purposes but people have +// become dependent on it so it lives on require "pstamp.php"; @@ -27,4 +28,7 @@ // Initialize variables $output_array = array(); + +// set to 1 to print command line and to change label to TEST +$TESTING = 0; $request_id = 0; @@ -35,4 +39,5 @@ $warp_selected = ""; $stack_selected = ""; +$stack_summary_selected = ""; $diff_selected = ""; @@ -56,14 +61,19 @@ $gpc1_selected=""; +$gpc2_selected=""; $mops_selected=""; $simtest_selected=""; -$require_class_id = 0; - +$require_component = 0; + +$rvar_email = ""; $rvar_select_by = ""; $rvar_img_type = ""; $rvar_id = ""; -$rvar_class_id = ""; -$rvar_cell_id = ""; +$rvar_component = ""; +$rvar_survey = "bypass"; +$rvar_release = ""; +$rvar_data_group = ""; +$rvar_filter = ""; $rvar_center_type = ""; @@ -79,4 +89,7 @@ $rvar_H = ""; +$rvar_make_jpeg = ""; +$rvar_getall_roi = ""; + $rvar_cmd_mode = ""; $rvar_last_cmd_mode = ""; @@ -90,11 +103,13 @@ if ($rvar_project == "gpc1") { $gpc1_selected = "selected"; -// $require_class_id = 1; +// $require_component = 1; +} else if ($rvar_project == "gpc2") { + $gpc2_selected = "selected"; } else if ($rvar_project == "megacam-mops") { $mops_selected = "selected"; - $require_class_id = 0; + $require_component = 0; } else { // if ($rvar_project == "simtest") { $simtest_selected = "selected"; - $require_class_id = 0; + $require_component = 0; } @@ -123,4 +138,6 @@ } else if ($rvar_img_type == "stack") { $stack_selected = "selected"; +} else if ($rvar_img_type == "stack_summary") { + $stack_summary_selected = "selected"; } else if ($rvar_img_type == "diff") { $diff_selected = "selected"; @@ -145,4 +162,16 @@ } +if ($rvar_make_jpeg) { + $make_jpeg_checked = "checked"; +} else { + $make_jpeg_checked = ""; +} + +if ($rvar_getall_roi) { + $getall_roi_checked = "checked"; +} else { + $getall_roi_checked = ""; +} + // When request_id is non-zero we respond to posts by check the status of that request // request_id gets set to zero when the status of all jobs for the request is 'stop' @@ -162,5 +191,5 @@ if ($rvar_cmd_mode == "Make Stamps") { $pstamp_checked = "checked"; -} else if ($rvar_cmd_mode == "Get Images") { +} else if ($rvar_cmd_mode == "Get Bundles") { $get_checked = "checked"; } else if ($rvar_cmd_mode == "Get Status") { @@ -185,19 +214,38 @@ try { $command_line = build_request_cmd(); + if ($TESTING) { + echo "$command_line\n"; + } $error_line = ""; - run_command($command_line); + $command_status = run_command($command_line); + // run_command($command_line); if (! $list_checked) { - // The only output from a successful run is the request_id - $request_name = trim(Array_pop($output_array)); - $request_id = Array_pop($output_array); - $last_request_id = $request_id; - if ($request_id && $request_name) { + // The only output from a successful run is the request_id and the request name + $words = array(); + $words = explode(" ", trim(Array_pop($output_array))); + $request_id = $words[0]; + $request_name = $words[1]; + + // echo "
Submission Results: Request_name: $request_name Request_id $request_id status: $command_status\n
"; + $whatthaheck = $request_id && $request_name; + // $whatthaheck = !$command_status; + // echo "
Boolean: $whatthaheck\n
"; + + // XXX: for some reason this does not evaluate to true + // if (!$command_status && $request_id && $request_name) { + if (!$command_status) { + $last_request_id = $request_id; addRequest($request_id, $request_name); // setcookie("our_request_id", $request_id); // echo "The request id is $request_id\n"; + // switch page Mode to Get Status $getstatus_checked = "checked"; $pstamp_checked = ""; + $get_checked = ""; } else { + echo "got an error\n"; // XXX: TODO print out the error + // This doesn't work + // echo "$error_line\n"; if (count($output_array) != 0) { throw new Exception("unexpected output returned by pstampwebrequest."); @@ -211,4 +259,8 @@ } } +} else { + // default to stack + $rvar_img_type = "stack"; + $stack_selected = "selected"; } @@ -218,4 +270,5 @@ { global $rvar_project; + global $rvar_email; global $sky_checked, $rsky_checked; global $list_checked; @@ -227,14 +280,26 @@ global $exp_checked, $file_checked, $coord_checked, $diff_checked; global $rvar_img_type; - global $rvar_id, $rvar_class_id; + global $rvar_id, $rvar_component; + global $rvar_data_group, $rvar_filter; + global $rvar_survey, $rvar_release; global $command_line; global $dbname; global $dbserver; - global $require_class_id; + global $require_component; global $PSCONFDIR, $PSCONFIG, $WORKDIR; global $SCRIPT; + global $TESTING; + global $rvar_make_jpeg; + global $rvar_getall_roi; $making_stamps = 1; $cmd = "$SCRIPT pstamp_webrequest.pl"; + +// echo "list_checked: $list_checked\n"; +// echo "get_checked: $get_checked\n
"; + + if ($TESTING) { + $cmd .= " --label TEST"; + } if ($list_checked) { @@ -245,8 +310,17 @@ $cmd .= " --job_type get_image"; } +// echo "making_stamps: $making_stamps
\n"; +// echo "$cmd
\n"; if ($dbname) { $cmd .= " --dbname $dbname --dbserver $dbserver"; } + + if (! $rvar_email ) { + throw new Exception('Email address must be specified.'); + } + // TODO: check for "valid" email address + $cmd .= " --username $rvar_email"; // This arg is used by pstamptool -addreq + $cmd .= " --email $rvar_email"; // This is used by psmkreq if (! $rvar_project ) { @@ -258,28 +332,41 @@ // TODO: put options on the GUI for these // $cmd .= " -mask -weight"; - } - - if ($making_stamps || $coord_checked) { + if ($rvar_img_type == "stack_summary") { + $cmd .= " --option_mask 196673"; + } + } + + if ($making_stamps) { // || $coord_checked) { // Set up the ROI parameters + $wholefile = 0; if ($sky_checked) { - if (! $rvar_RA || ! $rvar_DEC) { - throw new Exception('RA and DEC must be specified.'); + if ($rvar_RA == NULL || $rvar_DEC == NULL) { + throw new Exception("RA and DEC must be specified. Got: ($rvar_RA, $rvar_DEC)"); } $cmd .= " --ra $rvar_RA --dec $rvar_DEC"; } else { - if (! $rvar_X || ! $rvar_Y) { - throw new Exception('X and Y must be specified.'); - } - $cmd .= " -pixcenter --x $rvar_X --y $rvar_Y"; + if ($rvar_X == NULL || $rvar_Y == NULL) { + } + if ($rvar_X == 0 && $rvar_Y == 0) { + // Pixel center with both coordinates == 0 is code for return the whole file + $wholefile = 1; + } + $cmd .= " --pixcenter --x $rvar_X --y $rvar_Y"; } if ($rsky_checked) { if (! $rvar_dRA || ! $rvar_dDEC) { - throw new Exception('dRA and dDEC must be specified.'); + throw new Exception('dRA and dDEC must be non zero.'); } $cmd .= " --arcseconds --width $rvar_dRA --height $rvar_dDEC"; } else { if (! $rvar_W || ! $rvar_H) { - throw new Exception('width and height must be specified.'); + $wholefile = 1; + } + if ($wholefile) { + $rvar_W = 0; + $rvar_H = 0; + // } else if (! $rvar_W || ! $rvar_H) { + // throw new Exception('width and height must be specified and non zero.'); } $cmd .= " --width $rvar_W --height $rvar_H"; @@ -298,10 +385,15 @@ } if (! $rvar_id ) { - throw new Exception('Must set ID to the Exposure ID.'); + throw new Exception('Must set ID to the Exposure name.'); } $cmd .= " --req_type byexp --stage $rvar_img_type --id $rvar_id"; } else if ($file_checked) { if (! $rvar_id ) { - throw new Exception('Must set ID to the exposure name.'); + throw new Exception("Must set ID to the ${rvar_img_type}_id."); + } + $id = $rvar_id + 0; +// echo "id is $id rvar_id is $rvar_id\n"; + if (!$id) { + throw new Exception("$rvar_id is not a valid ${rvar_img_type}_id."); } $cmd .= " --req_type byid --stage $rvar_img_type --id $rvar_id"; @@ -317,14 +409,40 @@ } -// XXX: don't need to require class_id anymore +// XXX: don't need to require component anymore // if (($rvar_img_type == "raw") || ($rvar_img_type == "chip")) { -// if (!$sky_checked && ($require_class_id && ! $rvar_class_id )) { +// if (!$sky_checked && ($require_component && ! $rvar_component )) { // throw new Exception("must specify Class ID with Image Type $rvar_img_type."); // } - // leave off compoennt if we're looking up by coordinates. It breaks it - if (!$coord_checked && (($rvar_class_id) && ($rvar_class_id != "all"))) { - $cmd .= " --component $rvar_class_id"; + // leave off component if we're looking up by coordinates. The parser will figure it out + // IS THIS a good idea? What if somebody only wants images from a particular skycell? + if (!$coord_checked && (($rvar_component) && ($rvar_component != "all"))) { + $cmd .= " --component $rvar_component"; } // } + + if ($rvar_survey) { + $cmd .= " --survey $rvar_survey"; + } + if ($rvar_release) { + $cmd .= " --release $rvar_release"; + } + if ($rvar_data_group) { + $cmd .= " --data_group $rvar_data_group"; + } + if ($rvar_filter) { + $cmd .= " --filter $rvar_filter"; + } + + if ($rvar_img_type == 'stack') { + $cmd .= " --unconvolved"; + } + + if ($rvar_make_jpeg) { + $cmd .= " --jpeg"; + } + + if ($rvar_getall_roi) { + $cmd .= " --allroi"; + } return escapeshellcmd($cmd); @@ -337,5 +455,5 @@ global $command_status; - // echo "running $command_line\n"; + // echo "
running $command_line\n
"; exec ("$command_line", $output_array, $command_status); @@ -349,5 +467,5 @@ echo "Output: $size lines\n"; for ($i = 0; $i < $size; $i++) { - echo "$output_array[$i]\n"; + echo "
$i: $output_array[$i]\n"; } } @@ -359,5 +477,5 @@ } } - + return $command_status; } @@ -386,5 +504,7 @@ $dirName = "$dsroot/$product/$req_name"; // XXX: TODO: make this a configuration parameter - $filesetURL = "http://datastore.ipp.ifa.hawaii.edu/$product/$req_name"; + //$filesetURL = "http://datastore.ipp.ifa.hawaii.edu/$product/$req_name"; + $filesetURL = "http://datastore.ipp.ifa.hawaii.edu/ds/$product/$req_name"; + $fullpath = "$dirName/$fileName"; // echo "
fullpath: $fullpath filesetURL: $filesetURL\n
"; @@ -422,21 +542,49 @@ - Postage Stamp Request Form (prototype) + Prototype Postage Stamp Request Form : test +

-Postage Stamp Request Form +Prototype Postage Stamp Request Form : test

\n"; ?>
+ +Notice: This request submission form is an obsolete prototype -- MODIFIED 20180501 + +

Some time soon this form will no longer be available. +

Please migrate our requests to new more fully featured postage stamp +interface located at +PSI Postage Stamp Request Form. +
+Or upload your own request tables using the upload link. +

+This page will refresh in 20 mins + +


+ + + - - @@ -447,4 +595,15 @@
+ + + + + + @@ -455,4 +614,5 @@ @@ -612,4 +766,17 @@ + + + + + + +
+ +Email Address:   +  REQUIRED + +
+     +Release: +     +Data Group: +Filter: +
+ Produce a JPEG + +
+ Include all images in ROI (MOPS) + +
@@ -628,5 +795,5 @@ >Get Status >Make Stamps - >Get Bundles + >Get Bundles