Index: /tags/ipp-20101215/ippTasks/nightly_science.pro
===================================================================
--- /tags/ipp-20101215/ippTasks/nightly_science.pro	(revision 30127)
+++ /tags/ipp-20101215/ippTasks/nightly_science.pro	(revision 30128)
@@ -126,4 +126,6 @@
 
 book init nsData
+book init nsDiffs
+book init nsStacks
 #
 # Macros to control the book.
@@ -132,6 +134,11 @@
    book newpage nsData $1
    book setword nsData $1 nsState NEW
-   book setword nsData $1 nsStackState TOWARP
-   book setword nsData $1 nsDiffState TOWARP
+   book setword nsData $1 dbname $DB:0 
+
+   book newpage nsDiffs $1
+   book setword nsDiffs $1 nsStackState TOWARP
+   book newpage nsStacks $1
+   book setword nsStacks $1 nsStackState TOWARP
+
 end
 
@@ -141,7 +148,7 @@
        book getpage nsData $i -var date
        book getword nsData $date nsState -var state
-       book getword nsData $date nsStackState -var Sstate
-       book getword nsData $date nsDiffState -var Dstate
-       book getword nsData $date nsObservingState -var Ostate
+       book getword nsStacks $date nsStackState -var Sstate
+       book getword nsDiffs $date nsDiffState -var Dstate
+       book getword nsDiffs $date nsObservingState -var Ostate
        echo $date $state $Sstate $Dstate $Ostate
     end
@@ -174,6 +181,6 @@
     book newpage nsData $today
     book setword nsData $today nsState NEW
-    book setword nsData $today nsStackState TOWARP
-    book setword nsData $today nsDiffState TOWARP
+    book setword nsStacks $today nsStackState TOWARP
+    book setword nsDiffs $today nsDiffState TOWARP
     book setword nsData $today dbname $DB:0 
 
@@ -291,6 +298,6 @@
 
      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 nsStacks $date nsStackState -var ns_STATE
+     book getword nsDiffs $date nsDiffState -var ns_diff_STATE
      book getword nsData $date dbname -var $DBNAME
      book npages nsData -var Npages
@@ -316,13 +323,12 @@
   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
+    book delpage nsStacks $options:0
+    ipptool2book stdout nsStacks -uniq -key date
+
+    book getword nsStacks $options:0 nsNmacros -var ns_Nmacros
     if ("$ns_Nmacros" != "NULL") 
 	for i 0 $ns_Nmacros
 	    sprintf macroName "ns%dMacro" $i
-	    book getword nsData $options:0 $macroName -var macroCmd
+	    book getword nsStacks $options:0 $macroName -var macroCmd
 	    $macroCmd
 	end
@@ -363,6 +369,6 @@
 
      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 nsStacks $date nsStackState -var ns_STATE
+     book getword nsDiffs $date nsDiffState -var ns_diff_STATE
      book getword nsData $date dbname -var $DBNAME
      book npages nsData -var Npages
@@ -384,14 +390,13 @@
   task.exit   0
 #    convert 'stdout' to book format
-    book getword nsData $options:0 nsDiffState -var ns_diff_STATE
-    book delpage nsData $options:0
+    book delpage nsStacks $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
+    ipptool2book stdout nsStacks -uniq -key date
+
+    book getword nsStacks $options:0 nsNmacros -var ns_Nmacros
     if ("$ns_Nmacros" != "NULL") 
 	for i 0 $ns_Nmacros
 	    sprintf macroName "ns%dMacro" $i
-	    book getword nsData $options:0 $macroName -var macroCmd
+	    book getword nsStacks $options:0 $macroName -var macroCmd
 	    $macroCmd
 	end
@@ -432,5 +437,5 @@
 
      book getpage nsData $ns_CstackPAGE -var date
-     book getword nsData $date nsStackState -var ns_STATE
+     book getword nsStacks $date nsStackState -var ns_STATE
      book getword nsData $date dbname -var $DBNAME
      book npages nsData -var Npages
@@ -452,13 +457,12 @@
   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
+    book delpage nsStacks $options:0
+    ipptool2book stdout nsStacks -uniq -key date
+
+    book getword nsStacks $options:0 nsNmacros -var ns_Nmacros
     if ("$ns_Nmacros" != "NULL") 
 	for i 0 $ns_Nmacros
 	    sprintf macroName "ns%dMacro" $i
-	    book getword nsData $options:0 $macroName -var macroCmd
+	    book getword nsStacks $options:0 $macroName -var macroCmd
 	    $macroCmd
 	end
@@ -499,6 +503,6 @@
 
      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 nsDiffs $date nsDiffState -var ns_STATE
+     book getword nsStacks $date nsStackState -var ns_stack_STATE
      book getword nsData $date dbname -var $DBNAME
      book npages nsData -var Npages
@@ -521,14 +525,12 @@
   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
+    book delpage nsDiffs $options:0
+    ipptool2book stdout nsDiffs -uniq -key date
+
+    book getword nsDiffs $options:0 nsNmacros -var ns_Nmacros
     if ("$ns_Nmacros" != "NULL") 
 	for i 0 $ns_Nmacros
 	    sprintf macroName "ns%dMacro" $i
-	    book getword nsData $options:0 $macroName -var macroCmd
+	    book getword nsDiffs $options:0 $macroName -var macroCmd
 	    $macroCmd
 	end
@@ -569,6 +571,6 @@
 
      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 nsDiffs $date nsDiffState -var ns_STATE
+     book getword nsStacks $date nsStackState -var ns_stack_STATE
      book getword nsData $date dbname -var $DBNAME
      book npages nsData -var Npages
@@ -591,15 +593,13 @@
   task.exit   0
 #    convert 'stdout' to book format
-    book getword nsData $options:0 nsStackState -var ns_stack_STATE
-    book delpage nsData $options:0
+    book delpage nsDiffs $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
+    ipptool2book stdout nsDiffs -uniq -key date
+
+    book getword nsDiffs $options:0 nsNmacros -var ns_Nmacros
     if ("$ns_Nmacros" != "NULL") 
 	for i 0 $ns_Nmacros
 	    sprintf macroName "ns%dMacro" $i
-	    book getword nsData $options:0 $macroName -var macroCmd
+	    book getword nsDiffs $options:0 $macroName -var macroCmd
 	    $macroCmd
 	end