Index: branches/haf_add201112/ippTasks/mergedvodb.pro
===================================================================
--- branches/haf_add201112/ippTasks/mergedvodb.pro	(revision 33003)
+++ branches/haf_add201112/ippTasks/mergedvodb.pro	(revision 33021)
@@ -10,12 +10,9 @@
 
 if (not($?havemergedvodbBooks))
- book create MERGEDVODB
- book create MERGEDVODB_MERGE
+  book create MERGEDVODB_MERGE
   $havemergedvodbBooks = TRUE
 end
 
 $MERGEDVODB_DB = 0
-
-
 $MERGEDVODB_MERGE_DB = 0
 
@@ -49,16 +46,12 @@
 ## you get no choice - you add all of them in at the same time. you can always turn off the tasks you don't want to run.
 macro add.mergedvodb
-  if ($0 != 5)
-    echo "USAGE: add.mergedvodb (mergedvodb) (minidvodb_group) (camera)"
+  if ($0 != 2)
+    echo "USAGE: add.mergedvodb (mergedvodb)"
     break
   end
-
-  
     #merge  
   book newpage MERGEDVODB_MERGE $1
   book setword MERGEDVODB_MERGE $1 MERGEDVODB $1
-  book setword MERGEDVODB_MERGE $1 MINIDVODB_GROUP $2
   book setword MERGEDVODB_MERGE $1 STATE PENDING
-
 end
 
@@ -78,4 +71,7 @@
   echo "mergedvodb merge"
   book listbook MERGEDVODB_MERGE
+  echo "n pages"
+  book npages MERGEDVODB_MERGE -var N
+  echo $N
 end
 
@@ -95,12 +91,10 @@
     book npages MERGEDVODB_MERGE -var N
     if ($N == 0)
-#      echo "No labels for processing"
+      echo "No labels for processing"
       break
     endif
-
     book getpage MERGEDVODB_MERGE 0 -var mergedvodb -key STATE NEW
     if ("$mergedvodb" == "NULL")
       # All labels have been done --- reset
-#      echo "Resetting labels"
       for i 0 $N
         book getpage MERGEDVODB_MERGE $i -var mergedvodb
@@ -113,6 +107,6 @@
       if ($MERGEDVODB_DB >= $DB:n) set MERGEDVODB_DB = 0
     end
-    #finds the minidvodbs in a state of 'to_be_merged' 
-    book setword MERGEVODB_MERGE $mergedvodb STATE DONE
+    book setword MERGEDVODB_MERGE $mergedvodb STATE DONE
+    
     $run = mergetool -pendingmerge -limit 1
     $run = $run -mergedvodb $mergedvodb
@@ -126,6 +120,6 @@
       if ($MERGEDVODB_DB >= $DB:n) set MERGEDVODB_DB = 0
     end
-    add_poll_args run
-   
+    #add_poll_args run
+    #echo $run
     command $run
   end
@@ -133,4 +127,5 @@
   # success
   task.exit    0
+    #echo "success"
     # convert 'stdout' to book format
     ipptool2book stdout mergedvodbMergelist -key merge_id -uniq -setword dbname $options:0 -setword pantaskState INIT
@@ -156,7 +151,4 @@
   end
 end
-
-
-
 
 task           mergedvodb.merge.run
@@ -173,15 +165,12 @@
     # if we are unable to run the 'exec', use a long retry time
     periods -exec $RUNEXEC
-
     book npages mergedvodbMergelist -var N
     if ($N == 0) break
-    
     # look for new images in minidvodbWaitlist (pantaskState == INIT)
     book getpage mergedvodbMergelist 0 -var pageName -key pantaskState INIT
     if ("$pageName" == "NULL") break
-
     book setword mergedvodbMergelist $pageName pantaskState RUN
     book getword mergedvodbMergelist $pageName merge_id -var MERGE_ID
-    book getword mergedvodbMergelist $pageName mergedvodb -var MERGEDVODB_GROUP
+    book getword mergedvodbMergelist $pageName mergedvodb -var MERGEDVODB
     book getword mergedvodbMergelist $pageName mergedvodb_path -var MERGEDVODB_PATH
     book getword mergedvodbMergelist $pageName minidvodb_path -var MINIDVODB_PATH
@@ -189,7 +178,9 @@
     stdout $LOGDIR/mergedvodb.merge.run.log
     stderr $LOGDIR/mergedvodb.merge.run.log
-
-    $run = mergedvodb_merge.pl --camera GPC1 --mergedvodb_path $MERGEDVODB_PATH --minidvodb_path $MINIDVODB_PATH --merged_id $MERGE_ID
-    
+    $run = mergedvodb_merge.pl --camera GPC1 
+    $run = $run --mergedvodb_path $MERGEDVODB_PATH 
+    $run = $run --minidvodb_path $MINIDVODB_PATH 
+    $run = $run --merge_id $MERGE_ID --mergedvodb $MERGEDVODB
+    echo $run
   if ($DB:n == 0)
       option DEFAULT