Changeset 28035

Timestamp:

May 19, 2010, 3:05:14 PM (16 years ago)

Author:

heather

Message:

this works with addstar_run.pl, which supports minidvodb

File:

• branches/haf_branches/ipp.20100512/ippTasks/addstar.pro (modified) (6 diffs)

branches/haf_branches/ipp.20100512/ippTasks/addstar.pro

@@ -7 +7 @@
 
 book init addPendingExp
+book init minidvodbPending
 
 macro addstar.status
@@ -45 +46 @@
 end
 
+macro minidvodb.status
+  book listbook minidvodbPending
+end
+
+macro minidvodb.reset
+  book init minidvodbPending
+end
+
+macro minidvodb.create.on
+  task minidvodb.create
+    active true
+  end
+end
+macro minidvodb.create.off
+  task minidvodb.create
+    active false
+  end
+end
+
 # this variable will cycle through the known database names
 $addstar_DB = 0
 $addstar_revert_DB = 0
+$minidvodb_DB = 0
+$minidvodb_revert_DB = 0
+
 
 # select images ready for addstar analysis
@@ -64 +87 @@
 
   task.exec
-    if ($LABEL:n == 0) break
+   # if ($LABEL:n == 0) break
     $run = addtool -pendingexp
     if ($DB:n == 0)
@@ -134 +157 @@
     book getword addPendingExp $pageName reduction -var REDUCTION
     book getword addPendingExp $pageName dvodb  -var DVODB
+    book getword addPendingExp $pageName minidvodb  -var MINIDVODB
+    book getword addPendingExp $pageName minidvodb_name  -var MINIDVODB_NAME
+    book getword addPendingExp $pageName minidvodb_group  -var MINIDVODB_GROUP
     book getword addPendingExp $pageName image_only -var IMAGE_ONLY
     book getword addPendingExp $pageName dbname -var DBNAME
@@ -164 +190 @@
       $run = $run --image-only
     end
+    if ("$MINIDVODB" == "T")
+    $run = $run --minidvodb
+    $run = $run --minidvodb_group
+        if ("$MINIDVODB_NAME" != "NULL")
+           $run = $run --minidvodb_name  #have addstar_run.pl grab the 'active' name if it is NULL
+        end
+    end 
     
     add_standard_args run
@@ -242 +275 @@
   end
 end
+
+task minidvodb.create
+  host         local
+
+  periods      -poll 5.0
+  periods      -exec 60.0
+  periods      -timeout 1200
+  npending     1
+  active        false
+
+  stdout NULL
+  stderr $LOGDIR/revert.log
+
+  task.exec
+    if ($LABEL:n == 0) break
+    $run = addtool -revertprocessedexp
+    if ($DB:n == 0)
+      option DEFAULT
+    else
+      # save the DB name for the exit tasks
+      option $DB:$addstar_revert_DB
+      $run = $run -dbname $DB:$addstar_revert_DB
+      $addstar_revert_DB ++
+      if ($addstar_revert_DB >= $DB:n) set addstar_revert_DB = 0
+    end
+    add_poll_labels run
+    command $run
+  end
+
+  # success
+  task.exit    0
+  end
+
+  # locked list
+  task.exit    default
+    showcommand failure
+  end
+
+  task.exit    crash
+    showcommand crash
+  end
+
+  # operation times out?
+  task.exit    timeout
+    showcommand timeout
+  end
+end
+