Index: trunk/ippMonitor/def/camProcessedExp.d
===================================================================
--- trunk/ippMonitor/def/camProcessedExp.d	(revision 14096)
+++ trunk/ippMonitor/def/camProcessedExp.d	(revision 14113)
@@ -4,32 +4,45 @@
 MENU  ipp.science.dat
 
+# the following WHERE clauses are added to all queries joined by AND
 WHERE camRun.state = 'stop'
 WHERE camRun.chip_id = chipRun.chip_id
 WHERE chipRun.exp_id = rawExp.exp_id
-WHERE camProcessedExp.cam_id = camRun.cam_id
+WHERE camProcessedExp.cam_id  = camRun.cam_id
 WHERE camProcessedExp.chip_id = camRun.chip_id
 
+# 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)
 ARGS  ARG1  chipRun.exp_id=$chipRun.exp_id
 
-#     field                     size  name          show   link to                  extras
-FIELD camRun.cam_id,             5,   chip ID,      value, chipProcessedExp.php,    ARG1
-FIELD chipRun.chip_id,           5,   cam ID
-FIELD chipRun.exp_id,	         5,   exposure ID,  value, chipProcessedImfile.php, ARG1
-FIELD rawExp.exp_name,     	 5,   Exp Name,     value, rawImfile.php,  ARG1
-FIELD rawExp.telescope,      	10,   Telescope
-FIELD rawExp.camera,         	10,   Camera
-FIELD rawExp.dateobs,        	20,   Date/Time
-FIELD rawExp.filter,         	10,   FILTER
-FIELD rawExp.ra,       	         5,   RA    
-FIELD rawExp.decl,       	 5,   Dec
-FIELD rawExp.exp_time,       	 5,   exp_time    
-FIELD rawExp.sat_pixel_frac, 	 5,   f(sat pixels)
-FIELD rawExp.airmass,        	 5,   airmass     
-FIELD rawExp.bg,             	 5,   backgnd
-FIELD rawExp.bg_stdev,       	 5,   stdev    
-FIELD rawExp.bg_mean_stdev,  	 5,   <backgnd>
+ARGS  ARG2 camRun.cam_id=$camRun.cam_id
+ARGS  ARG2 rawExp.exp_id=$rawExp.exp_id
+ARGS  ARG2 camera=$rawExp.camera
+ARGS  ARG2 basename=$camProcessedExp.path_base
 
-FIELD camProcessedExp.n_stars,  5, Nstars
-FIELD camProcessedExp.n_astrom, 5, Nastrom
-FIELD camProcessedExp.sigma_ra, 5, sigma ra
-FIELD camProcessedExp.fwhm,     5, FHWM
+#     field                     	size  name          show   	 link to                  extras
+FIELD rawExp.exp_name,     		 5,   Exp Name,     value, 	 rawImfile.php,  ARG1
+FIELD chipRun.exp_id,	        	 5,   Exp ID,       value, 	 chipProcessedImfile.php, ARG1
+FIELD chipRun.chip_id,          	 5,   chip ID
+FIELD camRun.cam_id,            	 5,   cam ID,       value, 	 chipProcessedExp.php,    ARG1
+FIELD *,    	                	 8,   image,        image=JPEG2, camProcessedImfile.php,  ARG2
+FIELD rawExp.telescope,      		10,   Telescope
+FIELD rawExp.camera,         		10,   Camera
+FIELD rawExp.dateobs,        		20,   Date/Time
+FIELD rawExp.filter,         		10,   FILTER
+FIELD rawExp.ra,       	        	 5,   RA    
+FIELD rawExp.decl,       		 5,   Dec
+FIELD rawExp.exp_time,       		 5,   exp_time    
+FIELD rawExp.sat_pixel_frac, 		 5,   f(sat pixels)
+FIELD rawExp.airmass,        		 5,   airmass     
+FIELD camProcessedExp.bg,             	 5,   backgnd
+FIELD camProcessedExp.bg_stdev,       	 5,   stdev    
+FIELD camProcessedExp.bg_mean_stdev,  	 5,   <backgnd>
+FIELD camProcessedExp.n_stars,  	 5,   Nstars
+FIELD camProcessedExp.n_astrom, 	 5,   Nastrom
+FIELD camProcessedExp.sigma_ra, 	 5,   sigma ra
+FIELD camProcessedExp.fwhm,     	 5,   FHWM
+FIELD camProcessedExp.path_base,     	 5,   path_base,    none
+FIELD rawExp.exp_id,     		 5,   Exp ID,       none