Changeset 31405

Timestamp:

Apr 28, 2011, 3:56:55 PM (15 years ago)

Author:

rhenders

Message:

removed some log messages; added abstract alterPspsTables() method to be implemented by subclasses; now uses either 'full' dvo tables or on-the-fly

File:

• trunk/ippToPsps/jython/batch.py (modified) (8 diffs)

trunk/ippToPsps/jython/batch.py

@@ -32 +32 @@
     "../config/2/tables.vot"
     '''
-    def __init__(self, logger, batchType, inputFitsPath="", survey=""):
+    def __init__(self, logger, batchType, inputFitsPath="", survey="", useFullTables=False):
 
         # set up logging
         self.logger = logger
+        self.logger.info("-------------------------------------------------------------------------------")
         self.logger.debug("Batch class constructor")
 
@@ -43 +44 @@
         self.inputFitsPath = inputFitsPath
         self.survey = survey
+        self.useFullTables = useFullTables
 
         # TODO
@@ -53 +55 @@
         self.gpc1Db = Gpc1Db(self.logger)
         self.ippToPspsDb = IppToPspsDb(logger)
-        self.scratchDb = ScratchDb(logger)
+        self.scratchDb = ScratchDb(logger, self.useFullTables)
 
         if self.survey != "":
@@ -92 +94 @@
             # TODO close file?
 
-        # create DVO table
-        self.scratchDb.createDvoTables()
+        # create DVO tables if accessing DVO directly
+        if not self.useFullTables: self.scratchDb.createDvoTables()
 
     '''
@@ -315 +317 @@
              self.tablesToExport.append(table.name)
 
-         self.indexPspsTables()
+         self.alterPspsTables();
 
     '''
@@ -323 +325 @@
         self.logger.warn("indexIppTables not implemented")
 
-    '''
-    Subclass should implement this to index PSPS tables
+
+    '''
+    Alter PSPS tables
     '''   
-    def indexPspsTables(self):
-        self.logger.warn("indexPspsTables not implemented")
+    def alterPspsTables(self):
+        self.logger.warn("alterPspsTables not implemented")
 
     '''
@@ -370 +373 @@
     def exportPspsTablesToFits(self, regex="(.*)"):
 
-        self.logger.info("Exporting all PSPS tables to FITS")
+        self.logger.info("Replacing NULLs with -999 then exporting all PSPS tables to FITS")
         _tables = []
 
@@ -381 +384 @@
            # get everything from table
            _table = stilts.tread(self.scratchDb.url + '#SELECT * FROM ' + table)
-
-           self.logger.info("   Replacing NULLs with weird PSPS -999 constant for " + table)
 
            # replace nulls and empty fields with weird PSPS -999 pseudo-null