Changeset 35223 for trunk/ippToPsps/jython/dvo.py

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

File:

• trunk/ippToPsps/jython/dvo.py (modified) (3 diffs)

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),