Changeset 35226

Timestamp:

Mar 3, 2013, 2:08:14 PM (13 years ago)

Author:

eugene

Message:

pass scratch db (not name) down to appropriate level

Location:

trunk/ippToPsps/jython

Files:

• loader.py (modified) (1 diff)
• queue.py (modified) (2 diffs)
• scratchdb.py (modified) (1 diff)

trunk/ippToPsps/jython/loader.py

@@ -92 +92 @@
         except: return ret
            
-        self.dvoDetections = DvoDetections(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb.dbName)
+        self.dvoDetections = DvoDetections(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
 
         return ret

trunk/ippToPsps/jython/queue.py

@@ -16 +16 @@
 from dvoobjects import DvoObjects
 from batch import Batch
+from scratchdb import ScratchDb
 
 '''
@@ -28 +29 @@
         super(Queue, self).__init__(argv)
 
+        print "inited ipptopsps"
+
         # create various objects
         self.gpc1Db = Gpc1Db(self.logger, self.config)
+        print "connect to gpc1"
+
         self.datastore = Datastore(self.logger, self.skychunk, self.ippToPspsDb)
 
+        print "made datastore"
+
+        # connect to scratch database
+        self.scratchDb = ScratchDb(self.logger, self.config)
+
+        print "connect to scratchdb"
+
         try:
-            self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb)
+            self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
         except:
             self.exitProgram("Unable to create instance of DvoObject")
             raise
+
+        print "got objects"
 
         self.skychunk.printAll()

trunk/ippToPsps/jython/scratchdb.py

@@ -28 +28 @@
         else:
             dbType = "localdatabase"
+
+        print "trying to connect: ", dbType
 
         dbName = config.getDbName(dbType)