Changeset 30125

Timestamp:

Dec 20, 2010, 6:18:48 PM (15 years ago)

Author:

watersc1

Message:

fix diff/stack state clobbering

Location:

tags/ipp-20101215/ippTasks

Files:

• . (modified) (1 prop)
• nightly_science.pro (modified) (12 diffs)

tags/ipp-20101215/ippTasks/nightly_science.pro

@@ -292 +292 @@
      book getpage nsData $ns_stackPAGE -var date
      book getword nsData $date nsStackState -var ns_STATE
+     book getword nsData $date nsDiffState -var ns_diff_STATE
      book getword nsData $date dbname -var $DBNAME
      book npages nsData -var Npages
@@ -302 +303 @@
      if ($ns_stackPAGE >= $Npages) set ns_stackPAGE = 0
      option $date
+     option $ns_diff_STATE
 
      if ("$ns_STATE" != "TOWARP") break
@@ -314 +316 @@
   task.exit   0
 #    convert 'stdout' to book format
+    book getword nsData $options:0 nsDiffState -var ns_diff_STATE
     book delpage nsData $options:0
     ipptool2book stdout nsData -uniq -key date
-
+    book setword nsData $options:0 nsDiffState -var ns_diff_STATE
     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     if ("$ns_Nmacros" != "NULL") 
@@ -361 +364 @@
      book getpage nsData $ns_RstackPAGE -var date
      book getword nsData $date nsStackState -var ns_STATE
+     book getword nsData $date nsDiffState -var ns_diff_STATE
      book getword nsData $date dbname -var $DBNAME
      book npages nsData -var Npages
@@ -371 +375 @@
      if ($ns_RstackPAGE >= $Npages) set ns_RstackPAGE = 0
      option $date
-
+     option $ns_diff_STATE
      if (("$ns_STATE" != "QUEUESTACKS")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
      $run = nightly_science.pl --queue_stacks --date $date --dbname $DBNAME
@@ -380 +384 @@
   task.exit   0
 #    convert 'stdout' to book format
+    book getword nsData $options:0 nsDiffState -var ns_diff_STATE
     book delpage nsData $options:0
 # We've queued up stacking. We're done with this date, so don't reload the page.
     ipptool2book stdout nsData -uniq -key date
-
+    book setword nsData $options:0 nsDiffState -var ns_diff_STATE
     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     if ("$ns_Nmacros" != "NULL") 
@@ -447 +452 @@
   task.exit   0
 #    convert 'stdout' to book format
+    book getword nsData $options:0 nsDiffState -var ns_diff_STATE
     book delpage nsData $options:0
     ipptool2book stdout nsData -uniq -key date
-
+    book setword nsData $options:0 nsDiffState -var ns_diff_STATE
     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     if ("$ns_Nmacros" != "NULL") 
@@ -494 +500 @@
      book getpage nsData $ns_diffPAGE -var date
      book getword nsData $date nsDiffState -var ns_STATE
+     book getword nsData $date nsStackState -var ns_stack_STATE
      book getword nsData $date dbname -var $DBNAME
      book npages nsData -var Npages
@@ -514 +521 @@
   task.exit   0
 #    convert 'stdout' to book format
+    book getword nsData $options:0 nsStackState -var ns_stack_STATE
     book delpage nsData $options:0
     ipptool2book stdout nsData -uniq -key date
+    book setword nsData $options:0 nsStackState -var ns_stack_STATE
 
     book getword nsData $options:0 nsNmacros -var ns_Nmacros
@@ -561 +570 @@
      book getpage nsData $ns_RdiffPAGE -var date
      book getword nsData $date nsDiffState -var ns_STATE
+    book getword nsData $date nsStackState -var ns_stack_STATE
      book getword nsData $date dbname -var $DBNAME
      book npages nsData -var Npages
@@ -571 +581 @@
      if ($ns_RdiffPAGE >= $Npages) set ns_RdiffPAGE = 0
      option $date
+     option $ns_stack_STATE
 
      if (("$ns_STATE" != "QUEUEDIFFS")&&("$ns_STATE" != "TOWARP")&&("$ns_STATE" != "FORCETOWARP")) break
@@ -580 +591 @@
   task.exit   0
 #    convert 'stdout' to book format
+    book getword nsData $options:0 nsStackState -var ns_stack_STATE
     book delpage nsData $options:0
 # We've queued up diffing. We're done with this date, so don't reload the page.
     ipptool2book stdout nsData -uniq -key date
+    book setword nsData $options:0 nsStackState -var ns_stack_STATE
 
     book getword nsData $options:0 nsNmacros -var ns_Nmacros