Index: trunk/ippTasks/register.pro
===================================================================
--- trunk/ippTasks/register.pro	(revision 19748)
+++ trunk/ippTasks/register.pro	(revision 20124)
@@ -47,4 +47,36 @@
     active false
   end
+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)"
+    break
+  end
+
+  local surveyID
+
+  $surveyID = $1
+  $myCAMERA = $2
+  $myFILTER = $3
+  $myDATE   = $4
+
+  book getword surveys $surveyID label -var myLABEL
+  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
 end
 
@@ -258,18 +290,35 @@
     book getword regPendingExp $pageName workdir      -var WORKDIR_TEMPLATE
     book getword regPendingExp $pageName dbname       -var DBNAME
+    book getword regPendingExp $pageName camera       -var CAMERA
+    book getword regPendingExp $pageName filter       -var FILTER
+    book getword regPendingExp $pageName dateobs      -var DATEOBS
+    book getword regPendingExp $pageName obs_mode     -var OBS_MODE
+    book getword regPendingExp $pageName obs_group    -var OBS_GROUP
 
     # EXP_TAG is used to generate the unique, but human-readable, filenames
     sprintf EXP_TAG "%s.%s" $TMP_EXP_NAME $EXP_ID
 
+    # 2007-08-30T05:09:59Z
+    strlen $DATEOBS length
+    if ($length > 10)
+      substr $DATEOBS 0 4 YEAR
+      substr $DATEOBS 5 2 MONTH
+      substr $DATEOBS 8 2 DAY
+      $datestr = "$YEAR\$MONTH\$DAY"
+    end
+
+    # look up label, dvodb based on survey
+    ### XXX set.survey.data ....
+
     # specify choice of remote host
-    set.host.for.camera $TMP_CAMERA $TMP_CLASS_ID 
+    set.host.for.camera $TMP_CAMERA FPA
 
     # set the WORKDIR variable
-    set.workdir.by.camera $TMP_CAMERA $TMP_CLASS_ID $WORKDIR_TEMPLATE $default_host WORKDIR
+    set.workdir.by.camera $TMP_CAMERA FPA $WORKDIR_TEMPLATE $default_host WORKDIR
 
     # notes on how this works:
     # -- raw workdir examples:
     # file://data/@HOST@.0/gpc1/20080130
-    # neb:///@HOST@-vol0/gpc1/20080130 (need to supply volname?, or are we re-defining this each time?)
+    # neb:///@HOST@.0/gpc1/20080130
     # -- out workdir examples:
     # file://data/ipp004.0/gpc1/20080130