Index: branches/ccl_branches/ipponly-20191108/ippTasks/minidvodb.pro
===================================================================
--- branches/ccl_branches/ipponly-20191108/ippTasks/minidvodb.pro	(revision 41106)
+++ branches/ccl_branches/ipponly-20191108/ippTasks/minidvodb.pro	(revision 41211)
@@ -131,6 +131,6 @@
 ## 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.minidvodb
-  if ($0 != 7)
-    echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (interval addruns) (camera)"
+  if ($0 != 8)
+    echo "USAGE: add.minidvodb (minidvodb_group) (minidvodb) (dvodb) (interval days) (interval addruns) (camera) (minidvodb_host)"
     break
   end
@@ -145,5 +145,5 @@
   book setword MINIDVODB_PREMERGE $1 MINIDVODB_GROUP $1
   book setword MINIDVODB_PREMERGE $1 DVODB $3
-  book setword MINIDVODB_PREMERGE $1 CAMERA $5
+  book setword MINIDVODB_PREMERGE $1 CAMERA $6
   book setword MINIDVODB_PREMERGE $1 STATE PENDING
   #active  
@@ -161,4 +161,5 @@
   book setword MINIDVODB_CREATE $1 DVODB_NUM $5
   book setword MINIDVODB_CREATE $1 CAMERA $6  
+  book setword MINIDVODB_CREATE $1 MINIDVODB_HOST $7
   book setword MINIDVODB_CREATE $1 STATE PENDING  
 end
@@ -180,7 +181,7 @@
     break
   end
-  echo "minidvodb wait"
+  echo "minidvodb_wait"
   book listbook MINIDVODB
-  echo "minidvodb premerge"
+  echo "minidvodb_premerge"
   book listbook MINIDVODB_PREMERGE
   echo "minidvodb create"
@@ -191,8 +192,9 @@
 
 
-$LOADEXEC_MDB = 300
-
-
-
+#$LOADEXEC_MDB = 300
+$LOADEXEC_MDB = 2
+$timeout_mdb  = 2
+$LOADPOLL = 2
+$RUNEXEC = 2
 
 
@@ -202,5 +204,6 @@
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC_MDB
-  periods      -timeout 300
+#  periods      -timeout 300
+  periods      -timeout $timeout_mdb
   npending     1
 
@@ -211,5 +214,5 @@
     book npages MINIDVODB -var N
     if ($N == 0)
-#      echo "No labels for processing"
+      echo "No labels for processing minidvodb.wait.load"
       break
     endif
@@ -279,5 +282,6 @@
   periods      -poll $RUNPOLL
   periods      -exec $RUNEXEC
-  periods      -timeout 60
+#  periods      -timeout 60
+  periods      -timeout $timeout_mdb
 
   task.exec
@@ -511,10 +515,11 @@
 
 task           minidvodb.create
-  host         local
+#  host         local
 
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC_MDB
-  periods      -timeout 240
-  npending     1
+#  periods      -timeout 240
+  periods      -timeout $timeout_mdb
+#  npending     1
 
   stdout NULL
@@ -523,10 +528,10 @@
   task.exec
     
- periods      -poll 60
+# periods      -poll 60
 #wait a bit before trying again
 
     book npages MINIDVODB_CREATE -var N
     if ($N == 0)
-#      echo "No labels for processing"
+      echo "No labels for processing on minidvodb_create"
       break
     endif
@@ -552,5 +557,6 @@
     book getword MINIDVODB_CREATE $minidvodb_group DVODB_NUM -var dvodb_num
     book getword MINIDVODB_CREATE $minidvodb_group CAMERA -var camera
-    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days --num $dvodb_num
+    book getword MINIDVODB_CREATE $minidvodb_group MINIDVODB_HOST -var minidvodbhost
+    $run = minidvodb_createdb.pl --camera $camera --outroot $dvodb --dvodb $dvodb --minidvodb $minidvodb --minidvodb_group $minidvodb_group --interval $dvodb_days --num $dvodb_num --minidvodb_host $minidvodbhost
  
     if ($DB:n == 0)
@@ -593,10 +599,11 @@
 
 task           minidvodb.active.load
-  host         local
+#  host         local
 
   periods      -poll $LOADPOLL
   periods      -exec $LOADEXEC_MDB
-  periods      -timeout 30
-  npending     1
+#  periods      -timeout 30
+  periods      -timeout $timeout_mdb
+#  npending     1
 
   stdout NULL
@@ -606,5 +613,5 @@
     book npages MINIDVODB_ACTIVE -var N
     if ($N == 0)
-#      echo "No labels for processing"
+      echo "No labels for processing minidvodb.active.load"
       break
     endif
@@ -674,5 +681,6 @@
   periods      -poll $RUNPOLL
   periods      -exec $RUNEXEC
-  periods      -timeout 60
+#  periods      -timeout 60
+  periods      -timeout $timeout_mdb
 
   task.exec
@@ -693,5 +701,4 @@
 
     $run = addtool -flipminidvodbrun -minidvodb_group $MINIDVODB_GROUP
-    
    
 if ($DB:n == 0)