Index: branches/eam_branch_00/ippTasks/phase2.pro
===================================================================
--- branches/eam_branch_00/ippTasks/phase2.pro	(revision 11012)
+++ branches/eam_branch_00/ippTasks/phase2.pro	(revision 11059)
@@ -1,4 +1,4 @@
 ## this file contains the tasks for running the phase 0 stage
-## these tasks use the book p2PendingImfile
+## these tasks use the book Phase2Imfiles
 
 if ($?network == 0)
@@ -20,12 +20,12 @@
 exec mkdir -p $LOGSUBDIR
 
-book init p2PendingImfile
+book init Phase2Imfiles
 
 macro phase2.status
-  book listbook p2PendingImfile
+  book listbook Phase2Imfiles
 end
 
 # select images ready for phase2 analysis
-# new entries are added to p2PendingImfile
+# new entries are added to Phase2Imfiles
 # skip already-present entries
 task	       phase2.imfile.load
@@ -46,11 +46,11 @@
   task.exit    0
     # convert 'stdout' to book format
-    ipptool2book stdout p2PendingImfile -key exp_tag:class_id -uniq
+    ipptool2book stdout Phase2Imfiles -key exp_tag:class_id -uniq
     if ($VERBOSE > 2)
-      book listbook p2PendingImfile
+      book listbook Phase2Imfiles
     end
 
     # delete existing entries which are DONE
-    book delpage p2PendingImfile -key state DONE
+    book delpage Phase2Imfiles -key state DONE
   end
 
@@ -73,17 +73,17 @@
 
   task.exec
-    book npages p2PendingImfile -var N
+    book npages Phase2Imfiles -var N
     if ($N == 0) break
     if ($network == 0) break
     
-    # look for new images in p2PendingImfile (state == NULL)
-    book getpage p2PendingImfile 0 -var pageName -key state NULL
+    # look for new images in Phase2Imfiles (state == NULL)
+    book getpage Phase2Imfiles 0 -var pageName -key state NULL
     if ($pageName == NULL) break
 
-    book setword p2PendingImfile $pageName state RUN
-    book getword p2PendingImfile $pageName camera -var CAMERA
-    book getword p2PendingImfile $pageName exp_tag -var EXP_TAG
-    book getword p2PendingImfile $pageName class_id -var CLASS_ID
-    book getword p2PendingImfile $pageName uri -var URI
+    book setword Phase2Imfiles $pageName state RUN
+    book getword Phase2Imfiles $pageName camera -var CAMERA
+    book getword Phase2Imfiles $pageName exp_tag -var EXP_TAG
+    book getword Phase2Imfiles $pageName class_id -var CLASS_ID
+    book getword Phase2Imfiles $pageName uri -var URI
 
     # specify choice of remote host
@@ -118,5 +118,5 @@
   task.exit 0
     # phase2.pl updates DB tables, here we just update the page
-    book setword p2PendingImfile $options:0 state DONE
+    book setword Phase2Imfiles $options:0 state DONE
   end
 
@@ -124,5 +124,5 @@
   task.exit    default
     showcommand failure
-    book setword p2PendingImfile $options:0 state FAIL
+    book setword Phase2Imfiles $options:0 state FAIL
   end
 
@@ -130,5 +130,5 @@
   task.exit    timeout
     showcommand timeout
-    book setword p2PendingImfile $options:0 state TIMEOUT
+    book setword Phase2Imfiles $options:0 state TIMEOUT
   end
 end