Changeset 25423 for trunk/ippTasks

Timestamp:

Sep 16, 2009, 5:05:19 PM (17 years ago)

Author:

bills

Message:

added new magicDSRun.states goto_restored and goto_censored
The 'revert' process handles processing these transitions
the end result is either 'restored' or 'cesored'
Removed torestoreMode which wasn't implemented yet

File:

• trunk/ippTasks/destreak.pro (modified) (7 diffs)

trunk/ippTasks/destreak.pro

@@ -11 +11 @@
 book init magicDSToRevert
 
-### Database lists
+### indexes into Database lists
 $magicToDS_DB = 0
 $magicDSToRevert_DB = 0
+$magicDSCompletedRevert_DB = 0
 
 #list of stages
@@ -28 +29 @@
 ### Check status of tasks
 macro magic.status
-  book listbook magicToDS
-  book listbook magicDSToRevert
+    book listbook magicToDS
+    book listbook magicDSToRevert
 end
 
 ### Reset tasks
 macro magic.reset
-  book init magicToDS
-  book init magicDSToRevert
+    book init magicToDS
+    book init magicDSToRevert
 end
 
 ### Turn tasks on
 macro destreak.on
-  task destreak.load
-    active true
-  end
-  task destreak.run
-    active true
-  end
+    task destreak.load
+        active true
+    end
+    task destreak.run
+        active true
+    end
 end
 
@@ -55 +56 @@
         active true
     end
-end
+    task destreak.completed.revert
+        active true
+    end
+end
+
 ### Turn tasks off
 macro destreak.off
-  task destreak.load
-    active false
-  end
-  task destreak.run
-    active false
-  end
+    task destreak.load
+        active false
+    end
+    task destreak.run
+        active false
+    end
 end
 
@@ -71 +76 @@
     end
     task destreak.revert.run
+        active false
+    end
+    task destreak.completed.revert
         active false
     end
@@ -363 +371 @@
 
 task           destreak.completed.revert
+    # task to finish processing for magicDSRuns being reverted or restored
   host         local
 
   periods      -poll $LOADPOLL
-  periods      -exec $LOADEXEC
+  #periods      -exec $LOADEXEC
+  periods      -exec 30
   periods      -timeout 20
   npending     1
@@ -380 +390 @@
     else
       # save the DB name for the exit tasks
-      option $DB:$magicDSToRevert_DB
-      $run = $run -dbname $DB:$magicDSToRevert_DB
+      option $DB:$magicDSCompletedRevert_DB
+
+      $run = $run -dbname $DB:$magicDSCompletedRevert_DB
+
+      if ($magicDSCompletedRevert_DB >= $DB:n) set magicDSCompletedRevert_DB = 0
     end
     add_poll_args run
@@ -390 +403 @@
   # success
   task.exit    0
-    # convert 'stdout' to book format
-    ipptool2book stdout magicDSToRevert -key magic_ds_id:component -uniq -setword dbname $options:0 -setword pantaskState INIT
-    if ($VERBOSE > 2)
-      book listbook magicDSToRevert
-    end
-
-    # delete existing entries in the appropriate pantaskStates
-    process_cleanup magicDSToRevert
   end