Index: /trunk/ippMonitor/INSTALL
===================================================================
--- /trunk/ippMonitor/INSTALL	(revision 13853)
+++ /trunk/ippMonitor/INSTALL	(revision 13853)
@@ -0,0 +1,5 @@
+
+after setting up psconfig:
+
+psconfigure --dbhost alala --dbuser ipp --dbpass ipp --htdocs /var/www/localhost/htdocs
+
Index: unk/ippMonitor/Makefile
===================================================================
--- /trunk/ippMonitor/Makefile	(revision 13852)
+++ 	(revision )
@@ -1,175 +1,0 @@
-default: php
-help:
-	@echo "USAGE: make php"
-
-SRC     =       src
-DEF	=	def
-RAW	=	raw
-DESTBIN =       /var/www/kiawe/ippMonitor
-
-RAWSRC = \
-$(DESTBIN)/ipp.css \
-$(DESTBIN)/ipp.php \
-$(DESTBIN)/ipp.menu.dat \
-$(DESTBIN)/ipp.copy.dat \
-$(DESTBIN)/ipp.science.dat \
-$(DESTBIN)/ipp.detrend.dat \
-$(DESTBIN)/ipp.imfiles.dat \
-$(DESTBIN)/ipp.warp.dat \
-$(DESTBIN)/ipp.diff.dat \
-$(DESTBIN)/ipp.stack.dat \
-$(DESTBIN)/Login.php \
-$(DESTBIN)/SelectProject.php \
-$(DESTBIN)/LoadSetup.php \
-$(DESTBIN)/ScienceSteps.php \
-$(DESTBIN)/DetrendSteps.php \
-$(DESTBIN)/ImfileTables.php \
-$(DESTBIN)/WarpSteps.php \
-$(DESTBIN)/DiffSteps.php \
-$(DESTBIN)/StackSteps.php \
-$(DESTBIN)/phptest.php \
-$(DESTBIN)/getimage.php
-
-DEFSRC = \
-$(DESTBIN)/keptDetrendFrames.php \
-$(DESTBIN)/masterDetrendFrames.php \
-$(DESTBIN)/masterDetrendImfiles.php \
-$(DESTBIN)/detInputExp.php \
-$(DESTBIN)/detMasterFrame.php \
-$(DESTBIN)/detMasterImfile.php \
-$(DESTBIN)/detNormalizedExp.php \
-$(DESTBIN)/detNormalizedImfile.php \
-$(DESTBIN)/detNormalizedStatImfile.php \
-$(DESTBIN)/detProcessedImfile.php \
-$(DESTBIN)/detProcessedExp.php \
-$(DESTBIN)/detResidExp.php \
-$(DESTBIN)/detResidImfile.php \
-$(DESTBIN)/detRun.php \
-$(DESTBIN)/detRunSummary.php \
-$(DESTBIN)/detStackedImfile.php \
-$(DESTBIN)/newExp.php \
-$(DESTBIN)/newImfile.php \
-$(DESTBIN)/guidePendingExp.php \
-$(DESTBIN)/chipPendingExp.php \
-$(DESTBIN)/chipPendingImfile.php \
-$(DESTBIN)/chipProcessedExp.php \
-$(DESTBIN)/chipProcessedImfile.php \
-$(DESTBIN)/camPendingExp.php \
-$(DESTBIN)/camProcessedExp.php \
-$(DESTBIN)/pzPendingExp.php \
-$(DESTBIN)/pzPendingImfile.php \
-$(DESTBIN)/rawUnknownExp.php \
-$(DESTBIN)/rawDetrendExp.php \
-$(DESTBIN)/rawDetrendExp_detrend.php \
-$(DESTBIN)/rawImfile.php \
-$(DESTBIN)/rawImfile_failed.php \
-$(DESTBIN)/rawExp_failed.php \
-$(DESTBIN)/rawScienceExp.php \
-$(DESTBIN)/summitExp.php \
-$(DESTBIN)/warpRun.php \
-$(DESTBIN)/warpInputExp.php \
-$(DESTBIN)/warpSkycellMap.php \
-$(DESTBIN)/warpSkyfile.php \
-$(DESTBIN)/diffRun.php \
-$(DESTBIN)/diffInputSkyfile.php \
-$(DESTBIN)/diffSkyfile.php \
-$(DESTBIN)/stackRun.php \
-$(DESTBIN)/stackInputSkyfile.php \
-$(DESTBIN)/stackSumSkyfile.php
-
-
-PICTURES = \
-$(DESTBIN)/PScolorlogo2.jpg \
-$(DESTBIN)/missing.png
-
-DESTLINK = $(DESTBIN)/index.php
-
-php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK)
-
-# dependancy rules for binary code #########################
-# .PRECIOUS: %.$(ARCH).o
-# .PRECIOUS: $(BIN)/%.$(ARCH)
-
-$(DESTLINK): $(DESTBIN)/Login.php
-	rm -f $@
-	ln -s $(DESTBIN)/Login.php $@
-
-$(SRC)/%.php: $(DEF)/%.d $(DEF)/autocode.php ./generate
-	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-	./generate $< $(DEF)/autocode.php $@
-
-# $(SRC)/%.php: $(RAW)/%.php
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
-# 
-# $(SRC)/%.css: $(RAW)/%.css
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
-# 
-# $(SRC)/%.dat: $(RAW)/%.dat
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
-# 
-# $(SRC)/%.jpg: $(RAW)/%.jpg
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
-# 
-# $(SRC)/%.png: $(RAW)/%.png
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
-# 
-# $(SRC)/%.jpeg: $(RAW)/%.jpeg
-# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
-# 	cp $< $@
-
-# generated php code is built into SRC first
-$(DESTBIN)/%.php: $(SRC)/%.php
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.php || exit
-	cp $(SRC)/$*.php $(DESTBIN)/$*.php || exit
-
-# non-generated php code is copied directly
-$(DESTBIN)/%.php: $(RAW)/%.php
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.php || exit
-	cp $(RAW)/$*.php $(DESTBIN)/$*.php || exit
-
-# all other files are copied directly
-$(DESTBIN)/%.css: $(RAW)/%.css
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.css || exit
-	cp $(RAW)/$*.css $(DESTBIN)/$*.css || exit
-
-$(DESTBIN)/%.dat: $(RAW)/%.dat
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.dat || exit
-	cp $(RAW)/$*.dat $(DESTBIN)/$*.dat || exit
-
-$(DESTBIN)/%.jpg: $(RAW)/%.jpg
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.jpg || exit
-	cp $(RAW)/$*.jpg $(DESTBIN)/$*.jpg || exit
-
-$(DESTBIN)/%.jpeg: $(RAW)/%.jpeg
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.jpeg || exit
-	cp $(RAW)/$*.jpeg $(DESTBIN)/$*.jpeg || exit
-
-$(DESTBIN)/%.png: $(RAW)/%.png
-	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
-	rm -f $(DESTBIN)/$*.png || exit
-	cp $(RAW)/$*.png $(DESTBIN)/$*.png || exit
-
-# utilities #################################################
-
-clean:	
-	rm -f `find . -name "*.o"`
-	rm -f `find . -name "*~"`
-	rm -f `find . -name "#*"`
-
-.PRECIOUS: $(SRC)/%.php
-.PRECIOUS: $(SRC)/%.css
-.PRECIOUS: $(SRC)/%.dat
-.PRECIOUS: $(SRC)/%.png
-.PRECIOUS: $(SRC)/%.jpg
-.PRECIOUS: $(SRC)/%.jpeg
Index: /trunk/ippMonitor/Makefile.in
===================================================================
--- /trunk/ippMonitor/Makefile.in	(revision 13853)
+++ /trunk/ippMonitor/Makefile.in	(revision 13853)
@@ -0,0 +1,176 @@
+default: php
+help:
+	@echo "USAGE: make php"
+
+SRC     =       src
+DEF	=	def
+RAW	=	raw
+DESTBIN =       @HTDOCS@/ippMonitor
+
+RAWSRC = \
+$(DESTBIN)/ipp.css \
+$(DESTBIN)/ipp.php \
+$(DESTBIN)/site.php \
+$(DESTBIN)/ipp.menu.dat \
+$(DESTBIN)/ipp.copy.dat \
+$(DESTBIN)/ipp.science.dat \
+$(DESTBIN)/ipp.detrend.dat \
+$(DESTBIN)/ipp.imfiles.dat \
+$(DESTBIN)/ipp.warp.dat \
+$(DESTBIN)/ipp.diff.dat \
+$(DESTBIN)/ipp.stack.dat \
+$(DESTBIN)/Login.php \
+$(DESTBIN)/SelectProject.php \
+$(DESTBIN)/LoadSetup.php \
+$(DESTBIN)/ScienceSteps.php \
+$(DESTBIN)/DetrendSteps.php \
+$(DESTBIN)/ImfileTables.php \
+$(DESTBIN)/WarpSteps.php \
+$(DESTBIN)/DiffSteps.php \
+$(DESTBIN)/StackSteps.php \
+$(DESTBIN)/phptest.php \
+$(DESTBIN)/getimage.php
+
+DEFSRC = \
+$(DESTBIN)/keptDetrendFrames.php \
+$(DESTBIN)/masterDetrendFrames.php \
+$(DESTBIN)/masterDetrendImfiles.php \
+$(DESTBIN)/detInputExp.php \
+$(DESTBIN)/detMasterFrame.php \
+$(DESTBIN)/detMasterImfile.php \
+$(DESTBIN)/detNormalizedExp.php \
+$(DESTBIN)/detNormalizedImfile.php \
+$(DESTBIN)/detNormalizedStatImfile.php \
+$(DESTBIN)/detProcessedImfile.php \
+$(DESTBIN)/detProcessedExp.php \
+$(DESTBIN)/detResidExp.php \
+$(DESTBIN)/detResidImfile.php \
+$(DESTBIN)/detRun.php \
+$(DESTBIN)/detRunSummary.php \
+$(DESTBIN)/detStackedImfile.php \
+$(DESTBIN)/newExp.php \
+$(DESTBIN)/newImfile.php \
+$(DESTBIN)/guidePendingExp.php \
+$(DESTBIN)/chipPendingExp.php \
+$(DESTBIN)/chipPendingImfile.php \
+$(DESTBIN)/chipProcessedExp.php \
+$(DESTBIN)/chipProcessedImfile.php \
+$(DESTBIN)/camPendingExp.php \
+$(DESTBIN)/camProcessedExp.php \
+$(DESTBIN)/pzPendingExp.php \
+$(DESTBIN)/pzPendingImfile.php \
+$(DESTBIN)/rawUnknownExp.php \
+$(DESTBIN)/rawDetrendExp.php \
+$(DESTBIN)/rawDetrendExp_detrend.php \
+$(DESTBIN)/rawImfile.php \
+$(DESTBIN)/rawImfile_failed.php \
+$(DESTBIN)/rawExp_failed.php \
+$(DESTBIN)/rawScienceExp.php \
+$(DESTBIN)/summitExp.php \
+$(DESTBIN)/warpRun.php \
+$(DESTBIN)/warpInputExp.php \
+$(DESTBIN)/warpSkycellMap.php \
+$(DESTBIN)/warpSkyfile.php \
+$(DESTBIN)/diffRun.php \
+$(DESTBIN)/diffInputSkyfile.php \
+$(DESTBIN)/diffSkyfile.php \
+$(DESTBIN)/stackRun.php \
+$(DESTBIN)/stackInputSkyfile.php \
+$(DESTBIN)/stackSumSkyfile.php
+
+
+PICTURES = \
+$(DESTBIN)/PScolorlogo2.jpg \
+$(DESTBIN)/missing.png
+
+DESTLINK = $(DESTBIN)/index.php
+
+php: $(RAWSRC) $(DEFSRC) $(PICTURES) $(DESTLINK)
+
+# dependancy rules for binary code #########################
+# .PRECIOUS: %.$(ARCH).o
+# .PRECIOUS: $(BIN)/%.$(ARCH)
+
+$(DESTLINK): $(DESTBIN)/Login.php
+	rm -f $@
+	ln -s $(DESTBIN)/Login.php $@
+
+$(SRC)/%.php: $(DEF)/%.d $(DEF)/autocode.php ./generate
+	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
+	./generate $< $(DEF)/autocode.php $@
+
+# $(SRC)/%.php: $(RAW)/%.php
+# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
+# 	cp $< $@
+# 
+# $(SRC)/%.css: $(RAW)/%.css
+# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
+# 	cp $< $@
+# 
+# $(SRC)/%.dat: $(RAW)/%.dat
+# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
+# 	cp $< $@
+# 
+# $(SRC)/%.jpg: $(RAW)/%.jpg
+# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
+# 	cp $< $@
+# 
+# $(SRC)/%.png: $(RAW)/%.png
+# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
+# 	cp $< $@
+# 
+# $(SRC)/%.jpeg: $(RAW)/%.jpeg
+# 	@if [ ! -d $(SRC) ]; then mkdir -p $(SRC); fi
+# 	cp $< $@
+
+# generated php code is built into SRC first
+$(DESTBIN)/%.php: $(SRC)/%.php
+	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
+	rm -f $(DESTBIN)/$*.php || exit
+	cp $(SRC)/$*.php $(DESTBIN)/$*.php || exit
+
+# non-generated php code is copied directly
+$(DESTBIN)/%.php: $(RAW)/%.php
+	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
+	rm -f $(DESTBIN)/$*.php || exit
+	cp $(RAW)/$*.php $(DESTBIN)/$*.php || exit
+
+# all other files are copied directly
+$(DESTBIN)/%.css: $(RAW)/%.css
+	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
+	rm -f $(DESTBIN)/$*.css || exit
+	cp $(RAW)/$*.css $(DESTBIN)/$*.css || exit
+
+$(DESTBIN)/%.dat: $(RAW)/%.dat
+	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
+	rm -f $(DESTBIN)/$*.dat || exit
+	cp $(RAW)/$*.dat $(DESTBIN)/$*.dat || exit
+
+$(DESTBIN)/%.jpg: $(RAW)/%.jpg
+	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
+	rm -f $(DESTBIN)/$*.jpg || exit
+	cp $(RAW)/$*.jpg $(DESTBIN)/$*.jpg || exit
+
+$(DESTBIN)/%.jpeg: $(RAW)/%.jpeg
+	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
+	rm -f $(DESTBIN)/$*.jpeg || exit
+	cp $(RAW)/$*.jpeg $(DESTBIN)/$*.jpeg || exit
+
+$(DESTBIN)/%.png: $(RAW)/%.png
+	@if [ ! -d $(DESTBIN) ]; then mkdir -p $(DESTBIN) || exit; fi
+	rm -f $(DESTBIN)/$*.png || exit
+	cp $(RAW)/$*.png $(DESTBIN)/$*.png || exit
+
+# utilities #################################################
+
+clean:	
+	rm -f `find . -name "*.o"`
+	rm -f `find . -name "*~"`
+	rm -f `find . -name "#*"`
+
+.PRECIOUS: $(SRC)/%.php
+.PRECIOUS: $(SRC)/%.css
+.PRECIOUS: $(SRC)/%.dat
+.PRECIOUS: $(SRC)/%.png
+.PRECIOUS: $(SRC)/%.jpg
+.PRECIOUS: $(SRC)/%.jpeg
Index: /trunk/ippMonitor/configure
===================================================================
--- /trunk/ippMonitor/configure	(revision 13853)
+++ /trunk/ippMonitor/configure	(revision 13853)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+./configure.tcsh $*
Index: /trunk/ippMonitor/configure.tcsh
===================================================================
--- /trunk/ippMonitor/configure.tcsh	(revision 13853)
+++ /trunk/ippMonitor/configure.tcsh	(revision 13853)
@@ -0,0 +1,202 @@
+#!/bin/csh -f
+
+# this is a very low-tech version of configure, not built by autoconf.
+
+# user needs to supply:
+# --htdocs : top-level of www files
+# --dbhost : machine running database
+# --dbuser : username for database access
+# --dbpass : password for database access
+
+set htdocs  = ""
+set dbhost  = ""
+set dbuser  = ""
+set dbpass  = ""
+
+set prefix  = ""
+set bindir  = ""
+set libdir  = ""
+set datadir = ""
+
+set root    = ""
+set args    = ""
+
+while ("$1" != "") 
+ switch ("$1")
+  # options passed by jhbuild or others which we ignore
+  case --enable-maintainer-mode
+  case --no-create
+  case --no-recursion
+  case --sbindir*
+  case --libexecdir*
+  case --sharedstatedir*
+  case --localstatedir*
+  case --oldincludedir*
+  case --infodir*
+  case --mandir*
+  case --includedir*
+  case --sysconfdir*
+   # we need to strip the --opt word and --opt=word versions
+   set word = `echo $1 | tr = ' '`
+   if ($#word == 1) shift
+   breaksw;
+  case --htdocs*
+   if ("$1" == "--htdocs") then
+     shift
+     set htdocs = $1
+   else
+     set htdocs = `echo $1 | tr = ' ' | awk '{print $2}'`
+   endif
+   breaksw;
+  case --dbhost*
+   if ("$1" == "--dbhost") then
+     shift
+     set dbhost = $1
+   else
+     set dbhost = `echo $1 | tr = ' ' | awk '{print $2}'`
+   endif
+   breaksw;
+  case --dbuser*
+   if ("$1" == "--dbuser") then
+     shift
+     set dbuser = $1
+   else
+     set dbuser = `echo $1 | tr = ' ' | awk '{print $2}'`
+   endif
+   breaksw;
+  case --dbpass*
+   if ("$1" == "--dbpass") then
+     shift
+     set dbpass = $1
+   else
+     set dbpass = `echo $1 | tr = ' ' | awk '{print $2}'`
+   endif
+   breaksw;
+  case --prefix*
+   if ("$1" == "--prefix") then
+     shift
+     set prefix = $1
+   else
+     set prefix = `echo $1 | tr = ' ' | awk '{print $2}'`
+   endif
+   breaksw;
+  case --bindir*
+   if ("$1" == "--bindir") then
+     shift
+     set bindir = $1
+   else
+     set bindir = `echo $1 | tr = ' ' | awk '{print $2}'`
+   endif
+   breaksw;
+  case --libdir*
+   if ("$1" == "--libdir") then
+     shift
+     set libdir = $1
+   else
+     set libdir = `echo $1 | tr = ' ' | awk '{print $2}'`
+   endif
+   breaksw;
+  case --datadir*
+   if ("$1" == "--datadir") then
+     shift
+     set datadir = $1
+   else
+     set datadir = `echo $1 | tr = ' ' | awk '{print $2}'`
+   endif
+   breaksw;
+  case --help:
+   goto usage
+  case -*: 
+   echo ""
+   echo "Unknown option: $1"
+   goto usage
+  default:
+   set args=($args $1);
+   breaksw;
+ endsw
+ shift
+end
+if ($#args != 1) goto usage
+
+echo
+echo "prefix: $prefix"
+echo "bindir: $bindir"
+echo "libdir: $libdir"
+echo "datadir:$datadir"
+echo "htdocs: $htdocs"
+echo "dbhost: $dbhost"
+echo "dbuser: $dbuser"
+echo "dbpass: $dbpass"
+echo
+
+if ("$htdocs" == "") goto usage
+if ("$dbhost" == "") goto usage
+if ("$dbuser" == "") goto usage
+if ("$dbpass" == "") goto usage
+
+# BINDIR holds the output binary files
+if ("$bindir" == "") then
+  if ("$prefix" == "") goto usage
+  set bindir = $prefix/bin
+endif
+
+# LIBDIR set the install lib directory
+if ("$libdir" == "") then
+  if ("$prefix" == "") goto usage
+  set libdir = $prefix/lib
+endif
+
+# DATADIR holds the general non-binary files
+if ("$datadir" == "") then
+  if ("$prefix" == "") goto usage
+  set datadir = $prefix/share
+endif
+
+rm -f tmp.1 tmp.2
+
+# convert Makefile.in to Makefile:
+if (-e Makefile) mv -f Makefile Makefile~
+cat Makefile.in | sed "s|@HTDOCS@|$htdocs|" > tmp.1
+mv tmp.1 Makefile
+
+# convert raw/site.php.in to raw/site.php
+if (-e raw/site.php) mv -f raw/site.php raw/site.php~
+cat raw/site.php.in | sed "s|@DBHOST@|$dbhost|"  > tmp.1
+cat tmp.1           | sed "s|@DBUSER@|$dbuser|"  > tmp.2
+cat tmp.2           | sed "s|@DBPASS@|$dbpass|"  > tmp.1
+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|"   > raw/site.php
+rm -f tmp.1 tmp.2
+
+# need to set the PERLLIB and BINDIR variables (use prefix, bindir, libdir)
+
+exit 0
+
+usage:
+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
+
+set the database host, user, password with: --dbhost, --dbuser, -dbpass
+ 
+either --prefix or all of --bindir, --libdir, --datadir are required
+
+Configuration:
+  -h, --help              display this help and exit
+
+Installation directories:
+  --prefix=PREFIX         install architecture-independent files in PREFIX
+
+Fine tuning of the installation directories:
+  --bindir=DIR           user executables [PREFIX/bin/$ARCH] 
+  --libdir=DIR           object code libraries [PREFIX/lib/$ARCH]
+  --datadir=DIR          read-only architecture-independent data [PREFIX/share]
+
+EOF
+ exit 2;
Index: /trunk/ippMonitor/raw/ipp.php
===================================================================
--- /trunk/ippMonitor/raw/ipp.php	(revision 13852)
+++ /trunk/ippMonitor/raw/ipp.php	(revision 13853)
@@ -2,4 +2,5 @@
 
 $dTABLE = 80;
+include 'site.php';
 
 function logintext () {
@@ -62,14 +63,18 @@
 function dbconnect ($database) {
 
+  require_once('DB.php');
+
+  // these are set in 'site.php'
+  global $DBHOST;
+  global $DBUSER;
+  global $DBPASS;
+
   // connect to the database
-  // these should be set on installation
-  require_once('DB.php');
-  $password = "ipp";
-  $username = "ipp";
-  $hostname = "alala";
-  $db = DB::connect("mysql://$username:$password@$hostname/$database");
+  $db = DB::connect("mysql://$DBUSER:$DBPASS@$DBHOST/$database");
   if (DB::iserror($db)) {
     echo "<b>error accessing database</b><br>\n";
-    echo "<b>tried mysql://$username:$password@$hostname/$database</b><br>\n";
+    echo "<b>tried mysql://$DBUSER:XXX@$DBHOST/$database</b><br>\n";
+    $result = $db->getMessage();
+    echo "$result<br>";
     menu_end();
   }
@@ -471,13 +476,15 @@
     $basename = str_replace ('..','',$basename);
 
-    # XXX !!!
-    $PERLLIB = "/home/kiawe/eugene/psconfig/dev.linux/lib";
-    $BINDIR = "/home/kiawe/eugene/psconfig/dev.linux/bin";
-    $SITE = "/home/kiawe/eugene/.ipprc";
+    // these are defined by site.php
+    global $PERLLIB;
+    global $BINDIR;
+    global $SITE;
+
     putenv("PERL5LIB=$PERLLIB:");
     $PATH = getenv("PATH");
     putenv("PATH=$BINDIR:$PATH");
 
-    // echo "<br><b>ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id</b><br>\n";
+    // be careful of the definition of PATH in SITE: cannot contain HOME
+    // echo "<br>ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id<br>\n";
     exec ("ipp_filename.pl --site=$SITE --basename $basename --filerule $filerule --camera $camera --class_id $class_id", $output, $status);
 
Index: /trunk/ippMonitor/raw/site.php.in
===================================================================
--- /trunk/ippMonitor/raw/site.php.in	(revision 13853)
+++ /trunk/ippMonitor/raw/site.php.in	(revision 13853)
@@ -0,0 +1,11 @@
+<?php
+
+$DBHOST = "@DBHOST@";
+$DBUSER = "@DBUSER@";
+$DBPASS = "@DBPASS@";
+
+$PERLLIB = "@PERLLIB@";
+$BINDIR  = "@BINDIR@";
+$SITE    = "@SITE@/ippconfig/ipprc.config";
+
+?>