Index: trunk/ippMonitor/Makefile
===================================================================
--- trunk/ippMonitor/Makefile	(revision 10696)
+++ trunk/ippMonitor/Makefile	(revision 10963)
@@ -6,5 +6,5 @@
 DEF	=	def
 RAW	=	raw
-DESTBIN =       /var/www/kiawe/phpipp
+DESTBIN =       /var/www/kiawe/ippMonitor
 
 RAWSRC = \
@@ -59,11 +59,18 @@
 
 PICTURES = \
-$(DESTBIN)/PScolorlogo2.jpg
+$(DESTBIN)/PScolorlogo2.jpg \
+$(DESTBIN)/missing.png
 
-php: $(RAWSRC) $(DEFSRC) $(PICTURES)
+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
Index: trunk/ippMonitor/def/autocode.php
===================================================================
--- trunk/ippMonitor/def/autocode.php	(revision 10696)
+++ trunk/ippMonitor/def/autocode.php	(revision 10963)
@@ -107,4 +107,10 @@
 echo "</tr>\n";
 
+// query restriction form
+echo "<tr>\n";
+// echo "<td class=list> <input type=\"text\" name=\"expID\"></td>\n";
+// ** TABLE QUERY **
+echo "</tr>\n";
+
 // list the results
 while ($qry->fetchInto($row)) {
@@ -119,8 +125,8 @@
 
 // query restriction form
-echo "<tr>\n";
+// echo "<tr>\n";
 // echo "<td class=list> <input type=\"text\" name=\"expID\"></td>\n";
-// ** TABLE QUERY **
-echo "</tr>\n";
+// TABLE QUERY 
+// echo "</tr>\n";
 
 // close the table and form
Index: trunk/ippMonitor/def/detRun.d
===================================================================
--- trunk/ippMonitor/def/detRun.d	(revision 10696)
+++ trunk/ippMonitor/def/detRun.d	(revision 10963)
@@ -4,7 +4,18 @@
 MENU  ipp.detrend.dat
 
-#     field      name         show    link to              extras
-FIELD det_id,    20,   det ID,      value,  detRunSummary.php,   det_id=$det_id
-FIELD iteration, 20,   iteration
-FIELD det_type,  20,   det_type
-FIELD state,     20,   state
+#     field       width name         show    link to              extras
+FIELD det_id,      7,   det ID,      value,  detRunSummary.php,   det_id=$det_id
+FIELD iteration,   5,   iteration
+FIELD det_type,    8,   det_type
+FIELD state,       5,   state
+FIELD mode,        5,   mode
+FIELD exp_type,    8,   exp_type (drop)
+FIELD filter,     10,   filter     
+FIELD airmass,    10,   airmass    
+FIELD exp_time,   10,   exp_time   
+FIELD ccd_temp,   10,   ccd_temp   
+FIELD posang,     10,   posang     
+FIELD object,     10,   object     
+FIELD registered, 10,   registered 
+FIELD use_begin,  10,   use_begin  
+FIELD use_end,    10,   use_end    
Index: trunk/ippMonitor/def/rawDetrendExp.d
===================================================================
--- trunk/ippMonitor/def/rawDetrendExp.d	(revision 10696)
+++ trunk/ippMonitor/def/rawDetrendExp.d	(revision 10963)
@@ -4,21 +4,24 @@
 MENU  ipp.copy.dat
 
-#        field        name           show     link to         extras
-FIELD    exp_tag,      20,   exposure ID,   value,   rawImfile.php,  exp_tag=$exp_tag
-FIELD    telescope,   20,   Telescope
-FIELD    camera,      20,   Camera
-FIELD    exp_type,    20,   Type    
-FIELD    filter,      20,   FILTER
-# FIELD    imfiles,   20,   imfiles     
-# FIELD    airmass,   20,   airmass     
-# FIELD    ra,	      20,   ra          
-# FIELD    decl,      20,   decl        
-# FIELD    exp_time,  20,   exp_time    
-# FIELD    bg,	      20,   bg          
-# FIELD    bg_stdev,  20,   bg_stdev    
-# FIELD    bg_mean_stdev, 20,   bg_mean_stdev   
-# FIELD    alt,       20,   alt         
-# FIELD    az,	      20,   az          
-# FIELD    ccd_temp,  20,   ccd_temp    
-# FIELD    posang,    20,   posang      
-# FIELD    object,    20,   object
+#        field        name  show           link to  extras
+FIELD    exp_tag,     10,   exposure ID,   value,   rawImfile.php,  exp_tag=$exp_tag
+FIELD    telescope,   10,   Telescope
+FIELD    camera,      10,   Camera
+FIELD    exp_type,    10,   Type    
+FIELD    filter,      10,   FILTER
+FIELD    dateobs,     20,   Date/Time
+FIELD    exp_time,     5,   exp_time    
+FIELD    airmass,      5,   airmass     
+FIELD    bg,           5,   backgnd
+FIELD    bg_stdev,     5,   stdev    
+FIELD    bg_mean_stdev, 5,  &lt;backgnd&gt;
+# FIELD  ra,           8,   ra          
+# FIELD  decl,         8,   decl        
+# FIELD  object,      10,   object
+# FIELD  imfiles,     20,   imfiles     
+# FIELD  airmass,     20,   airmass     
+# FIELD  bg_mean_stdev, 20, bg_mean_stdev   
+# FIELD  alt,         20,   alt         
+# FIELD  az,	      20,   az          
+# FIELD  ccd_temp,    20,   ccd_temp    
+# FIELD  posang,      20,   posang      
Index: trunk/ippMonitor/def/rawImfile.d
===================================================================
--- trunk/ippMonitor/def/rawImfile.d	(revision 10696)
+++ trunk/ippMonitor/def/rawImfile.d	(revision 10963)
@@ -10,4 +10,5 @@
 FIELD    bg_stdev,      8,    stdev
 FIELD    bg_mean_stdev, 8,    [stdev]
+FIELD    uri,	       10,    uri
 # FIELD    class,       20,   Class
 # FIELD    uri,	      20,   uri
Index: trunk/ippMonitor/def/rawScienceExp.d
===================================================================
--- trunk/ippMonitor/def/rawScienceExp.d	(revision 10696)
+++ trunk/ippMonitor/def/rawScienceExp.d	(revision 10963)
@@ -4,17 +4,18 @@
 MENU  ipp.copy.dat
 
-#        field        name           show    link to         extras
-FIELD    exp_tag,     20,   exposure Tag,   value,   rawImfile.php,  exp_tag=$exp_tag,camera=$camera,foo=bar
-FIELD    telescope,   20,   Telescope,     value,  telescopes.php
-FIELD    camera,      20,   Camera
-FIELD    exp_type,    20,   Type    
-FIELD    filter,      20,   FILTER
+#        field        name           show          link to   extras
+FIELD    exp_tag,     10,   	     exposure Tag, value,    rawImfile.php,  exp_tag=$exp_tag,camera=$camera,foo=bar
+FIELD    telescope,   10,   	     Telescope,    value,    telescopes.php
+FIELD    camera,      10,   	     Camera
+FIELD    exp_type,     8,   	     Type    
+FIELD    filter,      10,   	     FILTER
+FIELD    ra,           8,   	     ra          
+FIELD    decl,         8,   	     decl        
+FIELD    object,      10,   	     object
+FIELD    airmass,      5,   	     airmass     
+FIELD    exp_time,     5,   	     exp_time    
+FIELD    bg,           5,   	     bg          
+FIELD    bg_stdev,     5,   	     bg_stdev    
 # FIELD    imfiles, 20,   imfiles     
-# FIELD    airmass, 20,   airmass     
-# FIELD    ra, 20,   ra          
-# FIELD    decl, 20,   decl        
-# FIELD    exp_time, 20,   exp_time    
-# FIELD    bg, 20,   bg          
-# FIELD    bg_stdev, 20,   bg_stdev    
 # FIELD    bg_mean_stdev, 20,   bg_mean_stdev   
 # FIELD    alt, 20,   alt         
@@ -22,3 +23,2 @@
 # FIELD    ccd_temp, 20,   ccd_temp    
 # FIELD    posang, 20,   posang      
-# FIELD    object,    20,   object
Index: trunk/ippMonitor/generate
===================================================================
--- trunk/ippMonitor/generate	(revision 10696)
+++ trunk/ippMonitor/generate	(revision 10963)
@@ -178,5 +178,5 @@
 sub write_table_header {
 
-    // add column sorting elements here
+    # add column sorting elements here
     for ($i = 0; $i < @field; $i++) {
 	if ($show[$i] eq "none")  { next; }
Index: trunk/ippMonitor/raw/getimage.php
===================================================================
--- trunk/ippMonitor/raw/getimage.php	(revision 10696)
+++ trunk/ippMonitor/raw/getimage.php	(revision 10963)
@@ -1,6 +1,8 @@
 <?php
 
-# $IMAGEDIR = "/data/alala/eugene/swtests/pantasks/";
-$CONFIGDIR = "/data/alala/eugene/src/panstarrs/ipp/config/ipprc.config";
+### these need to be set to the correct locations!!
+$PERLLIB = "/home/kiawe/eugene/psconfig/dev.linux/lib";
+$BINDIR = "/home/kiawe/eugene/psconfig/dev.linux/bin";
+$SITE = "/home/kiawe/eugene/.ipprc";
 $MISSING = "missing.png";
 
@@ -11,10 +13,25 @@
 }
 
-$basename = $_GET[name];
+$basename = escapeshellarg($_GET[name]);
 $basename = str_replace ('..','',$basename);
 
-$filename = system ("ipp_datapath.pl --site=$CONFIGDIR $IMAGEDIR", $status);
+putenv("PERL5LIB=$PERLLIB:");
+$PATH = getenv("PATH");
+putenv("PATH=$BINDIR:$PATH");
+
+exec ("ipp_datapath.pl --site=$SITE $basename", $output, $status);
+
+$filename = $output[0];
 if ($status) {
   $filename = $MISSING;
+}
+
+if (0) {
+  echo "basename: $basename<br>";
+  echo "result:   $result<br>";
+  echo "output:   $output[0]<br>";
+  echo "status:   $status<br>";
+  echo "filename: $filename<br>";
+  exit ();
 }
 
Index: trunk/ippMonitor/raw/ipp.copy.dat
===================================================================
--- trunk/ippMonitor/raw/ipp.copy.dat	(revision 10696)
+++ trunk/ippMonitor/raw/ipp.copy.dat	(revision 10963)
@@ -24,7 +24,8 @@
 
 menutop   | menutop      | plain   | &nbsp;                       | 
+menulink  | menuselect 	 | link    | Raw Detrend Exp              | rawDetrendExp.php             
+menulink  | menuselect 	 | link    | Raw Science Exp              | rawScienceExp.php             
+menutop   | menutop      | plain   | &nbsp;                       | 
 menulink  | menuselect 	 | link    | Summit Exp                   | summitExp.php                         
 menulink  | menuselect 	 | link    | Copy Pending Exp             | pzPendingExp.php              
 menulink  | menuselect 	 | link    | New Exp                      | newExp.php                    
-menulink  | menuselect 	 | link    | Raw Detrend Exp              | rawDetrendExp.php             
-menulink  | menuselect 	 | link    | Raw Science Exp              | rawScienceExp.php             
Index: trunk/ippMonitor/raw/ipp.detrend.dat
===================================================================
--- trunk/ippMonitor/raw/ipp.detrend.dat	(revision 10696)
+++ trunk/ippMonitor/raw/ipp.detrend.dat	(revision 10963)
@@ -25,8 +25,10 @@
 menutop   | menutop      | plain   | &nbsp;                       | 
 menulink  | menuselect 	 | link    | Detrend Frames               | masterDetrendFrames.php
-menulink  | menuselect 	 | link    | Detrend Runs                 | detRunSummary.php             
+menulink  | menuselect 	 | link    | Detrend Runs                 | detRun.php             
+menulink  | menuselect 	 | link    | Detrend Iterations           | detRunSummary.php             
+menulink  | menulink     | plain   | &nbsp;                       | 
 menulink  | menuselect 	 | link    | Raw Detrend Exp              | rawDetrendExp_detrend.php
 menulink  | menuselect 	 | link    | Input Detrend Exp            | detInputExp.php
 menulink  | menuselect 	 | link    | Proc Detrend Exp             | detProcessedExp.php
+menulink  | menuselect 	 | link    | Norm Detrend Exp             | detNormalizedExp.php
 menulink  | menuselect 	 | link    | Resid Detrend Exp            | detResidExp.php
-menulink  | menuselect 	 | link    | Norm Detrend Exp             | detNormalizedExp.php
Index: trunk/ippMonitor/raw/ipp.science.dat
===================================================================
--- trunk/ippMonitor/raw/ipp.science.dat	(revision 10696)
+++ trunk/ippMonitor/raw/ipp.science.dat	(revision 10963)
@@ -27,4 +27,5 @@
 menulink  | menuselect 	 | link    | P2 Processed Exp             | p2ProcessedExp.php            
 menulink  | menuselect 	 | link    | P3 Processed Exp             | p3ProcessedExp.php            
+menutop   | menutop      | plain   | &nbsp;                       | 
 menulink  | menuselect 	 | link    | P1 Pending Exp               | p1PendingExp.php              
 menulink  | menuselect 	 | link    | P2 Pending Exp               | p2PendingExp.php