Changeset 28211 for trunk/ippTasks

Timestamp:

Jun 3, 2010, 7:11:23 PM (16 years ago)

Author:

heather

Message:

minidvodb tested. trying itout on MD05, 04 and 07 now.

Location:

trunk/ippTasks

Files:

• addstar.pro (modified) (1 diff)
• minidvodb.pro (modified) (5 diffs)
• survey.pro (modified) (1 diff)

trunk/ippTasks/addstar.pro

@@ -171 +171 @@
     if ("$MINIDVODB" == "T")
     $run = $run --minidvodb
-    $run = $run --minidvodb_group
+    $run = $run --minidvodb_group $MINIDVODB_GROUP
         if (("$MINIDVODB_NAME" != "NULL") && ("$MINIDVODB_NAME" != "(null)"))
-           $run = $run --minidvodb_name  #have addstar_run.pl grab the 'active' name if it is NULL
+           $run = $run --minidvodb_name $MINIDVODB_NAME #have addstar_run.pl grab the 'active' name if it is NULL
         end
     end 

trunk/ippTasks/minidvodb.pro

@@ -227 +227 @@
     end
 #using check as opposed to list because it sees if it is done with the addRun state yet.  
+    book setword MINIDVODB $minidvodb_group STATE DONE
     $run = addtool -checkminidvodbrunaddrun -state waiting
     $run = $run -minidvodb_group $minidvodb_group
@@ -369 +370 @@
       if ($MINIDVODB_DB >= $DB:n) set MINIDVODB_DB = 0
     end
-    #finds the minidvodbs in a state of 'to_be_merged'    
-    $run = addtool -listminidvodbrun -state to_be_merged
+    #finds the minidvodbs in a state of 'to_be_merged' 
+    book setword MINIDVODB_MERGE $minidvodb_group STATE DONE
+    $run = addtool -listminidvodbrun -state to_be_merged -limit 1
     $run = $run -minidvodb_group $minidvodb_group
     if ($DB:n == 0)
@@ -418 +420 @@
   periods      -poll $RUNPOLL
   periods      -exec $RUNEXEC
-  periods      -timeout 60
+  periods      -timeout 20000
+  
+  #we only want one running at a time
+
+  host         local
+  npending     1
 
   task.exec
@@ -447 +454 @@
       # save the DB name for the exit tasks
       option $DB:$MINIDVODB_DB
-      $run = $run -dbname $DB:$MINIDVODB_DB
+      $run = $run --dbname $DB:$MINIDVODB_DB
       $MINIDVODB_DB ++
       if ($MINIDVODB_DB >= $DB:n) set MINIDVODB_DB = 0
@@ -605 +612 @@
       end
       book getpage MINIDVODB_ACTIVE 0 -var minidvodb_group -key STATE NEW
-
+      
       # Select different database
       $MINIDVODB_DB ++
       if ($MINIDVODB_DB >= $DB:n) set MINIDVODB_DB = 0
     end
-
+    book setword MINIDVODB_ACTIVE $minidvodb_group STATE DONE
     
     $run = addtool -listminidvodbrun -state new

trunk/ippTasks/survey.pro

@@ -650 +650 @@
     end
     
-    $run = $run -definebyquery -destreaked -label $label -set_dvodb $dvodb -set_minidvodb_group $minidvodb_group
+    $run = $run -definebyquery -destreaked -label $label -set_dvodb $dvodb -set_minidvodb_group $minidvodb_group -set_minidvodb -set_label $minidvodb_group
     echo $run
     command $run