Index: trunk/ippTasks/pantasks.pro
===================================================================
--- trunk/ippTasks/pantasks.pro	(revision 16173)
+++ trunk/ippTasks/pantasks.pro	(revision 16195)
@@ -342,28 +342,55 @@
 
 macro set.workdir.by.camera
+  if ($0 != 6)
+    echo "USAGE: set.workdir.by.camera (camera) (class_id) (template) (default) (varname)"
+    echo " uses global variable NEBULOUS to determine if nebulous is active"
+    break
+  end
+
+  local host default template camera classID varname
+  $camera = $1
+  $classID = $2
+  $template = $3
+  $default = $4
+  $varname = $5
+
+  # missing camera and/or chiphosts table results in host = NULL
+  book getword chiphosts $camera $classID -var host
+
+  if ("$host" == "NULL")
+    strsub $template @HOST@ $default -var $$varname
+  else
+    strsub $template @HOST@ $host -var $$varname
+  end
+end
+
+macro set.volume.by.camera
   if ($0 != 3)
-    echo "USAGE: set.workdir.by.camera (camera) (class_id)"
-    break
-  end
+    echo "USAGE: set.volume.by.camera (camera) (class_id) (template) (default) (varname)"
+    echo " uses global variable NEBULOUS to determine if nebulous is active"
+    break
+  end
+
+  local host default template camera classID varname
+  $camera = $1
+  $classID = $2
+  $template = $3
+  $default = $4
+  $varname = $5
 
   # missing camera and/or chiphosts table results in host = NULL
-  book getword chiphosts $1 $2 -var $host
-
-  if ($NEBULOUS)
-    if ("$host" == "NULL")
-      $workdir = $workdir_default
-      $volume  = "NULL"
-      return
-    end
-    strsub $workdir_template @HOST@ $host -var workdir
-    strsub $volume_template @HOST@ $host -var volume
-    return
-  end
-
-  if ("$host" == "NULL")
-    $workdir = $workdir_default
-    return
-  end
-  strsub $workdir_template @HOST@ $host -var workdir
+  book getword chiphosts $camera $classID -var host
+
+  if (not($NEBULOUS))
+    $$varname = "NULL"
+    return
+  end
+
+  if ("$host" == "NULL") 
+    $$varname = $default
+    return
+  end
+
+  strsub $template @HOST@ $host -var $$varname
 end