Index: /trunk/ippTasks/register.pro
===================================================================
--- /trunk/ippTasks/register.pro	(revision 20135)
+++ /trunk/ippTasks/register.pro	(revision 20136)
@@ -49,13 +49,25 @@
 end
 
+macro replace.survey.values
+  if ($0 != 5)
+    echo "USAGE: replace.survey.values (varname) (CAMERA) (FILTER) (DATE)"
+    break
+  end
+
+  strsub $$1 @CAMERA@ $2 -var $1
+  strsub $$1 @FILTER@ $3 -var $1
+  strsub $$1 @DATE@   $4 -var $1
+  echo "adding $$1"
+end
+
 # we want to set the following arguments to register_exp.pl
 # --label ($myLABEL) --dvodb ($myDVODB) --workdir ($myWORKDIR) 
 macro set.survey.data
-  if ($0 != NNN)
-    echo "USAGE: set.survey.data (obs_mode) (camera) (filter) (datestr)"
+  if ($0 != 7)
+    echo "USAGE: set.survey.data (surveyID) (camera) (filter) (datestr) (workdir) (cmdflags)"
     break
   end
 
-  local surveyID
+  local surveyID myCAMERA myFILTER myDATE myUPDATE 
 
   $surveyID = $1
@@ -64,19 +76,46 @@
   $myDATE   = $4
 
+  $$6 = ""
+
+  $myUPDATE1 = ""
   book getword surveys $surveyID label -var myLABEL
+  if ("$myLABEL" != "NULL") 
+    replace.survey.values myLABEL $myCAMERA $myFILTER $myDATE
+    $myUPDATE1 = --label $myLABEL
+  end
+
+  $myUPDATE2 = ""
   book getword surveys $surveyID dvodb -var myDVODB
-  book getword surveys $surveyID wsubd -var myWSUBD
-  
-  strsub $myLABEL @CAMERA@ $myCAMERA -var myLABEL
-  strsub $myLABEL @FILTER@ $myFILTER -var myLABEL
-  strsub $myLABEL @DATE@   $myDATE   -var myLABEL
-
-  strsub $myDVODB @CAMERA@ $myCAMERA -var myDVODB
-  strsub $myDVODB @FILTER@ $myFILTER -var myDVODB
-  strsub $myDVODB @DATE@   $myDATE   -var myDVODB
-
-  strsub $myWSUBD @CAMERA@ $myCAMERA -var myWSUBD
-  strsub $myWSUBD @FILTER@ $myFILTER -var myWSUBD
-  strsub $myWSUBD @DATE@   $myDATE   -var myWSUBD
+  if ("$myDVODB" != "NULL") 
+    replace.survey.values myDVODB $myCAMERA $myFILTER $myDATE
+    $myUPDATE2 = --dvodb $myDVODB
+  end
+
+  $myUPDATE3 = ""
+  book getword surveys $surveyID end_stage -var myENDSTAGE
+  if ("$myENDSTAGE" != "NULL") 
+    replace.survey.values myENDSTAGE $myCAMERA $myFILTER $myDATE
+    $myUPDATE3 = --end_stage $myENDSTAGE
+  end
+
+  $myUPDATE4 = ""
+  book getword surveys $surveyID tess_id -var myTESSID
+  if ("$myTESSID" != "NULL") 
+    replace.survey.values myTESSID $myCAMERA $myFILTER $myDATE
+    $myUPDATE4 = --tess_id $myTESSID
+  end
+
+  $$6  = $myUPDATE1 $myUPDATE2 $myUPDATE3 $myUPDATE4
+
+  book getword surveys $surveyID worksubdir -var myWORKSUB
+  if ("$myWORKSUB" != "NULL") 
+    replace.survey.values myWORKSUB $myCAMERA $myFILTER $myDATE
+    $$5 = $$5/$myWORKSUB
+  end
+end
+
+macro load.surveys
+  queueload tmp -x "cat surveys.mhpcc.config"
+  ipptool2book tmp surveys -key survey
 end
 
@@ -309,5 +348,5 @@
 
     # look up label, dvodb based on survey
-    ### XXX set.survey.data ....
+    set.survey.data $OBS_MODE $CAMERA $FILTER $DATEOBS WORKDIR_TEMPLATE CMDFLAGS
 
     # specify choice of remote host
@@ -330,5 +369,5 @@
     stderr $LOGDIR/register.exp.run.log
 
-    $run = register_exp.pl --exp_id $EXP_ID --exp_tag $EXP_TAG --logfile $logfile
+    $run = register_exp.pl --exp_id $EXP_ID --exp_tag $EXP_TAG --logfile $logfile $CMDFLAGS
     add_standard_args run