Changeset 35076 for branches/eam_branches/ipp-20121219/ippToPsps/jython/setupScratchDb.py

Timestamp:

Jan 31, 2013, 4:13:09 PM (13 years ago)

Author:

eugene

Message:

split out config (static info) and skychunk (area being processed)

File:

• branches/eam_branches/ipp-20121219/ippToPsps/jython/setupScratchDb.py (modified) (5 diffs)

branches/eam_branches/ipp-20121219/ippToPsps/jython/setupScratchDb.py

@@ -2 +2 @@
 
 import sys
+import os
+import socket
 import stilts
 from java.lang import *
 from java.sql import *
 
-
-from ipptopsps import IppToPsps
+from config import Config
 from scratchdb import ScratchDb
+from ipptopspsdb import IppToPspsDb
 
 '''
 SetupScratchDb class
 '''
-class SetupScratchDb(IppToPsps):
+class SetupScratchDb(object):
+
+    ## XXX EAM : 2013.01.31 - i have changed the 'config.py' concept
+    ## to only include the global static information (from
+    ## settings.xml), and stripped out the dynamic information to a
+    ## new entity called 'skychunk'
 
     ## XXX note that setupScratchDb.py fails if there are no valid
@@ -47 +54 @@
     '''
     def __init__(self, argv):
-        super(SetupScratchDb, self).__init__(argv)
+        # set up config object
+        self.config = Config()
 
-        if len(argv) < 3:
+        if len(argv) < 2:
             self.printUsage()
             self.exitProgram("incorrect args")
 
+        # some class constants
+        self.HOST = socket.gethostname()
+        self.PID = os.getpid()
+
+        # XXX Shouldn't config set up logger? 
+        # (not yet, since we set HOST & PID with program...)
+        self.logger = self.config.getLogger(self.HOST, self.PID, 1, 0)
+
         try:
-            self.scratchDb = ScratchDb(self.logger, self.config, '0', argv[2])
+            self.scratchDb = ScratchDb(self.logger, self.config, argv[1])
         except:
             self.exitProgram("Could not connect to a scratch Db")
             raise
-
 
     def run(self):
@@ -70 +85 @@
         # install IN tables
         self.logger.infoPair("Installing", "initialization tables")
-        if self.configDir is None:
-            tables = stilts.treads("../config/tables.IN.vot")
-        else:
-            tablepath = self.configDir + "tables.IN.vot"
-            tables = stilts.treads(tablepath)
+        tablepath = self.config.configDir + "tables.IN.vot"
+        tables = stilts.treads(tablepath)
 
         for table in tables:
@@ -86 +98 @@
         self.scratchDb.createDvoTables()
 
-    '''
-    Overrides base-class version
-    '''
     def printUsage(self):
-        super(SetupScratchDb, self).printUsage("<scratchdb_name>")
+        # write message to log or stdout if no logger set up
+        msg = os.path.basename(sys.argv[0]) + " <scratchdb_version> "
+        try:
+            self.logger.errorPair("Usage:", msg)
+        except: 
+            print "*** Usage: " + msg
 
 '''
@@ -100 +114 @@
     setupScratchDb.exitProgram("completed")
 except: pass
-
-