Changeset 35223

Timestamp:

Mar 3, 2013, 1:31:54 PM (13 years ago)

Author:

eugene

Message:

instead of creating a new connection to the scratch db for each new object, pass the scratchdb connection down to dvo.py

Location:

trunk/ippToPsps/jython

Files:

• dvo.py (modified) (3 diffs)
• dvodetections.py (modified) (1 diff)
• dvoobjects.py (modified) (1 diff)
• objectbatch.py (modified) (1 diff)

trunk/ippToPsps/jython/dvo.py

@@ -34 +34 @@
 
     '''
-    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDbName=None):
+    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
 
         # set up logging
@@ -41 +41 @@
         self.skychunk = skychunk
         self.ippToPspsDb = ippToPspsDb
+        self.scratchDb = scratchDb
 
         # set up empty lists
@@ -49 +50 @@
         self.regionsIngestedButOutOfDate = []
        
-        # connect to the specified scratch database, if a name is given, otherwise use the first version
-        try:
-            self.scratchDb = ScratchDb(self.logger, self.config)
-        except: raise
-
         # we have (still) 3 modes of ingest from dvo cpt/cps/cpm files 
         # 1) dvograbber (useFullTables == FALSE), 

trunk/ippToPsps/jython/dvodetections.py

@@ -20 +20 @@
     Constructor
     '''
-    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDbName):
+    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
 
-        super(DvoDetections, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDbName)
+        super(DvoDetections, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
 
         # declare DVO file types of interest

trunk/ippToPsps/jython/dvoobjects.py

@@ -20 +20 @@
     Constructor
     '''
-    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDbName=None):
+    def __init__(self, logger, config, skychunk, ippToPspsDb, scratchDb):
 
-        super(DvoObjects, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDbName)
+        super(DvoObjects, self).__init__(logger, config, skychunk, ippToPspsDb, scratchDb)
 
         # declare DVO file types of interest

trunk/ippToPsps/jython/objectbatch.py

@@ -55 +55 @@
        try:
            ## XX pass in the existing connection to scratchDb
-           self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb.dbName)
+           self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
        except:
            self.logger.errorPair("Unable to create instance of", "DvoObjects")