Index: trunk/ippMonitor/raw/getimage.php
===================================================================
--- trunk/ippMonitor/raw/getimage.php (revision 10963)
+++ trunk/ippMonitor/raw/getimage.php (revision 11490)
@@ -13,10 +13,31 @@
}
-$basename = escapeshellarg($_GET[name]);
-$basename = str_replace ('..','',$basename);
-
putenv("PERL5LIB=$PERLLIB:");
$PATH = getenv("PATH");
putenv("PATH=$BINDIR:$PATH");
+
+# echo "args: $args
";
+
+# $basename may contain filename@filerule
+$basename = strtok($_GET[name],"@");
+$filerule = strtok("@");
+
+# echo "basename: $basename
";
+# echo "filerule: $filerule
";
+
+# need to supply the camera as well...
+# exec ("ipp_filerule.pl --site=$SITE $basename", $output, $status);
+
+if ($filerule) {
+ if ($filerule == "PPIMAGE.JPEG1") {
+ $basename = "$basename.b1.jpg";
+ }
+ if ($filerule == "PPIMAGE.JPEG2") {
+ $basename = "$basename.b2.jpg";
+ }
+}
+
+$basename = escapeshellarg($basename);
+$basename = str_replace ('..','',$basename);
exec ("ipp_datapath.pl --site=$SITE $basename", $output, $status);
Index: trunk/ippMonitor/raw/ipp.copy.dat
===================================================================
--- trunk/ippMonitor/raw/ipp.copy.dat (revision 10963)
+++ trunk/ippMonitor/raw/ipp.copy.dat (revision 11490)
@@ -26,6 +26,10 @@
menulink | menuselect | link | Raw Detrend Exp | rawDetrendExp.php
menulink | menuselect | link | Raw Science Exp | rawScienceExp.php
+menulink | menuselect | link | Raw Unknown Exp | rawUnknownExp.php
menutop | menutop | plain | |
menulink | menuselect | link | Summit Exp | summitExp.php
menulink | menuselect | link | Copy Pending Exp | pzPendingExp.php
menulink | menuselect | link | New Exp | newExp.php
+menutop | menutop | plain | |
+menulink | menuselect | link | Failed Raw Imfiles | rawImfile_failed.php
+menulink | menuselect | link | Failed Raw Exp | rawExp_failed.php
Index: trunk/ippMonitor/raw/ipp.php
===================================================================
--- trunk/ippMonitor/raw/ipp.php (revision 10963)
+++ trunk/ippMonitor/raw/ipp.php (revision 11490)
@@ -200,5 +200,5 @@
echo "\n";
- $root = "/phpipp";
+ $root = "/ippMonitor";
if (! $project) { $project = "none"; }
@@ -307,4 +307,19 @@
}
+// expect image supplied with key=name
+// this function should define matching hidden inputs in the form
+function insert_backref ($page, $key, $link) {
+
+ if ($_SERVER[REQUEST_METHOD] == 'GET') {
+ $name = $_GET[$key];
+ } else {
+ $name = $_POST[$key];
+ }
+
+ if ($name) {
+ echo "back to $name
\n";
+ }
+}
+
// $myPage = $_SERVER[SCRIPT_NAME] . "?pass=$pass";