Changeset 24662 for trunk/ippMonitor

Timestamp:

Jul 3, 2009, 11:46:32 AM (17 years ago)

Author:

eugene

Message:

allow ippMonitor installation to define specific ipprc.config file; remove image display from non-image camera page

Location:

trunk/ippMonitor

Files:

• INSTALL (modified) (1 diff)
• configure.tcsh (modified) (8 diffs)
• def/camProcessedExp.d (modified) (2 diffs)
• raw/ipp.science.dat (modified) (1 diff)
• raw/site.php.in (modified) (1 diff)

trunk/ippMonitor/INSTALL

@@ -14 +14 @@
  psconfigure --dbhost ipp004 --dbuser ipp --dbpass ipp --htdocs ~ipp/htdocs
 
+ipp@ipp004 / ippdb01 example:
+ psconfigure --dbhost ippdb01 --dbuser ipp --dbpass ipp --htdocs ~/htdocs --site ~/ippconfig/ipprc.config
+

trunk/ippMonitor/configure.tcsh

@@ -18 +18 @@
 set libdir  = ""
 set datadir = ""
+set site = ""
 
 set DBI     = "DB"
@@ -107 +108 @@
    endif
    breaksw;
+  case --site*
+   if ("$1" == "--site") then
+     shift
+     set site = $1
+   else
+     set site = `echo $1 | tr = ' ' | awk '{print $2}'`
+   endif
+   breaksw;
   case --useMDB2
    set DBI = "MDB2"
@@ -129 +138 @@
 echo "libdir: $libdir"
 echo "datadir:$datadir"
+echo "site:   $site"
 echo "htdocs: $htdocs"
 echo "dbhost: $dbhost"
@@ -157 +167 @@
   if ("$prefix" == "") goto usage
   set datadir = $prefix/share
+endif
+
+# SITE defines the location of the ipprc.config file
+if ("$site" == "") then
+  if ("$datadir" == "") goto usage
+  set site = $datadir/ippconfig/ipprc.config
 endif
 
@@ -174 +190 @@
 cat tmp.1           | sed "s|@BINDIR@|$bindir|"  > tmp.2
 cat tmp.2           | sed "s|@PERLLIB@|$libdir|" > tmp.1
-cat tmp.1           | sed "s|@SITE@|$datadir|"   > tmp.2
+cat tmp.1           | sed "s|@SITE@|$site|"      > tmp.2
 cat tmp.2           | sed "s|@DBI@|$DBI|"        > raw/site.php
 rm -f tmp.1 tmp.2
@@ -183 +199 @@
 
 usage:
+if ($#args > 1) then
+  echo unrecognized options: $args
+endif
+
 cat <<EOF
 USAGE: configure [OPTION]
 
-echo $#args
-echo remaining args: $args
-
 set the WWW installation directory root with --htdocs
 set the IPP installation directory root with --prefix
@@ -194 +211 @@
 set the database host, user, password with: --dbhost, --dbuser, -dbpass
  
-either --prefix or all of --bindir, --libdir, --datadir are required
+either --prefix or both --bindir and --libdir and [--datadir or --site] are required
+
+if both --datadir and --site are defined, --site overrides the ipprc.config definition
 
 Configuration:
@@ -206 +225 @@
   --libdir=DIR           object code libraries [PREFIX/lib/$ARCH]
   --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+  --site=PATH            location of the ipprc.config file [DATADIR/ippconfig/ipprc.config]
 
 EOF

trunk/ippMonitor/def/camProcessedExp.d

@@ -10 +10 @@
 WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.fault = 0
-
-# define image names to be used below
-# IMAGE VAR basename filerule camera class_id
-IMAGE JPEG2 $camProcessedExp.path_base PPIMAGE.JPEG2 $rawExp.camera NONE
 
 # define the arguments supplied to the links below (if any)
@@ -32 +28 @@
 FIELD chipRun.chip_id,                   5,   %s,     Chip ID,      value,       chipProcessedImfile.php, ARG2
 FIELD camRun.cam_id,                     5,   %s,     Cam ID,       value,       camProcessedExp.php,     ARG3
+FIELD camRun.state,                      5,   %s,     state,        value,       camProcessedImfile.php,  ARG4
 FIELD camRun.label,                      5,   %s,     Label
-FIELD *,                                 8,   %s,     image,        image=JPEG2, camProcessedImfile.php,  ARG4
 FIELD rawExp.telescope,                 10,   %s,     Telescope
 FIELD rawExp.camera,                    10,   %s,     Camera

trunk/ippMonitor/raw/ipp.science.dat

@@ -39 +39 @@
 menulink  | menuselect   | link    | Cam-Stage Exp                | camStageExp.php            
 menulink  | menuselect   | link    | Cam Pending Exp              | camPendingExp.php              
+menulink  | menuselect   | link    | Cam IQ Stats                 | camIQstats.php            
 menulink  | menuselect   | link    | Cam Processed Exp            | camProcessedExp.php            
 menulink  | menuselect   | link    | Cam Proc. w/ Images          | camProcessedExp_Images.php            
-menulink  | menuselect   | link    | Cam IQ Stats                 | camIQstats.php            
 menulink  | menuselect   | link    | Cam Failed Exp               | camProcessedExp_failure.php
 menulink  | menuselect   | link    | Cam Processed Imfiles        | camProcessedImfile.php            

trunk/ippMonitor/raw/site.php.in

@@ -7 +7 @@
 $PERLLIB = "@PERLLIB@";
 $BINDIR  = "@BINDIR@";
-$SITE    = "@SITE@/ippconfig/ipprc.config";
+$SITE    = "@SITE@";
 
 $DBI     = "@DBI@";