IPP Software Navigation Tools IPP Links Communication Pan-STARRS Links

Changeset 30128


Ignore:
Timestamp:
Dec 21, 2010, 12:11:28 PM (15 years ago)
Author:
watersc1
Message:

better book handling

File:
1 edited

Legend:

Unmodified
Added
Removed
  • tags/ipp-20101215/ippTasks/nightly_science.pro

    r30125 r30128  
    126126
    127127book init nsData
     128book init nsDiffs
     129book init nsStacks
    128130#
    129131# Macros to control the book.
     
    132134   book newpage nsData $1
    133135   book setword nsData $1 nsState NEW
    134    book setword nsData $1 nsStackState TOWARP
    135    book setword nsData $1 nsDiffState TOWARP
     136   book setword nsData $1 dbname $DB:0
     137
     138   book newpage nsDiffs $1
     139   book setword nsDiffs $1 nsStackState TOWARP
     140   book newpage nsStacks $1
     141   book setword nsStacks $1 nsStackState TOWARP
     142
    136143end
    137144
     
    141148       book getpage nsData $i -var date
    142149       book getword nsData $date nsState -var state
    143        book getword nsData $date nsStackState -var Sstate
    144        book getword nsData $date nsDiffState -var Dstate
    145        book getword nsData $date nsObservingState -var Ostate
     150       book getword nsStacks $date nsStackState -var Sstate
     151       book getword nsDiffs $date nsDiffState -var Dstate
     152       book getword nsDiffs $date nsObservingState -var Ostate
    146153       echo $date $state $Sstate $Dstate $Ostate
    147154    end
     
    174181    book newpage nsData $today
    175182    book setword nsData $today nsState NEW
    176     book setword nsData $today nsStackState TOWARP
    177     book setword nsData $today nsDiffState TOWARP
     183    book setword nsStacks $today nsStackState TOWARP
     184    book setword nsDiffs $today nsDiffState TOWARP
    178185    book setword nsData $today dbname $DB:0
    179186
     
    291298
    292299     book getpage nsData $ns_stackPAGE -var date
    293      book getword nsData $date nsStackState -var ns_STATE
    294      book getword nsData $date nsDiffState -var ns_diff_STATE
     300     book getword nsStacks $date nsStackState -var ns_STATE
     301     book getword nsDiffs $date nsDiffState -var ns_diff_STATE
    295302     book getword nsData $date dbname -var $DBNAME
    296303     book npages nsData -var Npages
     
    316323  task.exit   0
    317324#    convert 'stdout' to book format
    318     book getword nsData $options:0 nsDiffState -var ns_diff_STATE
    319     book delpage nsData $options:0
    320     ipptool2book stdout nsData -uniq -key date
    321     book setword nsData $options:0 nsDiffState -var ns_diff_STATE
    322     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     325    book delpage nsStacks $options:0
     326    ipptool2book stdout nsStacks -uniq -key date
     327
     328    book getword nsStacks $options:0 nsNmacros -var ns_Nmacros
    323329    if ("$ns_Nmacros" != "NULL")
    324330        for i 0 $ns_Nmacros
    325331            sprintf macroName "ns%dMacro" $i
    326             book getword nsData $options:0 $macroName -var macroCmd
     332            book getword nsStacks $options:0 $macroName -var macroCmd
    327333            $macroCmd
    328334        end
     
    363369
    364370     book getpage nsData $ns_RstackPAGE -var date
    365      book getword nsData $date nsStackState -var ns_STATE
    366      book getword nsData $date nsDiffState -var ns_diff_STATE
     371     book getword nsStacks $date nsStackState -var ns_STATE
     372     book getword nsDiffs $date nsDiffState -var ns_diff_STATE
    367373     book getword nsData $date dbname -var $DBNAME
    368374     book npages nsData -var Npages
     
    384390  task.exit   0
    385391#    convert 'stdout' to book format
    386     book getword nsData $options:0 nsDiffState -var ns_diff_STATE
    387     book delpage nsData $options:0
     392    book delpage nsStacks $options:0
    388393# We've queued up stacking. We're done with this date, so don't reload the page.
    389     ipptool2book stdout nsData -uniq -key date
    390     book setword nsData $options:0 nsDiffState -var ns_diff_STATE
    391     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     394    ipptool2book stdout nsStacks -uniq -key date
     395
     396    book getword nsStacks $options:0 nsNmacros -var ns_Nmacros
    392397    if ("$ns_Nmacros" != "NULL")
    393398        for i 0 $ns_Nmacros
    394399            sprintf macroName "ns%dMacro" $i
    395             book getword nsData $options:0 $macroName -var macroCmd
     400            book getword nsStacks $options:0 $macroName -var macroCmd
    396401            $macroCmd
    397402        end
     
    432437
    433438     book getpage nsData $ns_CstackPAGE -var date
    434      book getword nsData $date nsStackState -var ns_STATE
     439     book getword nsStacks $date nsStackState -var ns_STATE
    435440     book getword nsData $date dbname -var $DBNAME
    436441     book npages nsData -var Npages
     
    452457  task.exit   0
    453458#    convert 'stdout' to book format
    454     book getword nsData $options:0 nsDiffState -var ns_diff_STATE
    455     book delpage nsData $options:0
    456     ipptool2book stdout nsData -uniq -key date
    457     book setword nsData $options:0 nsDiffState -var ns_diff_STATE
    458     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     459    book delpage nsStacks $options:0
     460    ipptool2book stdout nsStacks -uniq -key date
     461
     462    book getword nsStacks $options:0 nsNmacros -var ns_Nmacros
    459463    if ("$ns_Nmacros" != "NULL")
    460464        for i 0 $ns_Nmacros
    461465            sprintf macroName "ns%dMacro" $i
    462             book getword nsData $options:0 $macroName -var macroCmd
     466            book getword nsStacks $options:0 $macroName -var macroCmd
    463467            $macroCmd
    464468        end
     
    499503
    500504     book getpage nsData $ns_diffPAGE -var date
    501      book getword nsData $date nsDiffState -var ns_STATE
    502      book getword nsData $date nsStackState -var ns_stack_STATE
     505     book getword nsDiffs $date nsDiffState -var ns_STATE
     506     book getword nsStacks $date nsStackState -var ns_stack_STATE
    503507     book getword nsData $date dbname -var $DBNAME
    504508     book npages nsData -var Npages
     
    521525  task.exit   0
    522526#    convert 'stdout' to book format
    523     book getword nsData $options:0 nsStackState -var ns_stack_STATE
    524     book delpage nsData $options:0
    525     ipptool2book stdout nsData -uniq -key date
    526     book setword nsData $options:0 nsStackState -var ns_stack_STATE
    527 
    528     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     527    book delpage nsDiffs $options:0
     528    ipptool2book stdout nsDiffs -uniq -key date
     529
     530    book getword nsDiffs $options:0 nsNmacros -var ns_Nmacros
    529531    if ("$ns_Nmacros" != "NULL")
    530532        for i 0 $ns_Nmacros
    531533            sprintf macroName "ns%dMacro" $i
    532             book getword nsData $options:0 $macroName -var macroCmd
     534            book getword nsDiffs $options:0 $macroName -var macroCmd
    533535            $macroCmd
    534536        end
     
    569571
    570572     book getpage nsData $ns_RdiffPAGE -var date
    571      book getword nsData $date nsDiffState -var ns_STATE
    572     book getword nsData $date nsStackState -var ns_stack_STATE
     573     book getword nsDiffs $date nsDiffState -var ns_STATE
     574     book getword nsStacks $date nsStackState -var ns_stack_STATE
    573575     book getword nsData $date dbname -var $DBNAME
    574576     book npages nsData -var Npages
     
    591593  task.exit   0
    592594#    convert 'stdout' to book format
    593     book getword nsData $options:0 nsStackState -var ns_stack_STATE
    594     book delpage nsData $options:0
     595    book delpage nsDiffs $options:0
    595596# We've queued up diffing. We're done with this date, so don't reload the page.
    596     ipptool2book stdout nsData -uniq -key date
    597     book setword nsData $options:0 nsStackState -var ns_stack_STATE
    598 
    599     book getword nsData $options:0 nsNmacros -var ns_Nmacros
     597    ipptool2book stdout nsDiffs -uniq -key date
     598
     599    book getword nsDiffs $options:0 nsNmacros -var ns_Nmacros
    600600    if ("$ns_Nmacros" != "NULL")
    601601        for i 0 $ns_Nmacros
    602602            sprintf macroName "ns%dMacro" $i
    603             book getword nsData $options:0 $macroName -var macroCmd
     603            book getword nsDiffs $options:0 $macroName -var macroCmd
    604604            $macroCmd
    605605        end
Note: See TracChangeset for help on using the changeset viewer.