Changeset 35235 for branches/eam_branches/ipp-20130207/ippToPsps/jython/objectbatch.py

Timestamp:

Mar 5, 2013, 2:23:09 PM (13 years ago)

Author:

eugene

Message:

merge changes from trunk

Location:

branches/eam_branches/ipp-20130207/ippToPsps

Files:

• . (modified) (1 prop)
• jython/objectbatch.py (modified) (4 diffs)

branches/eam_branches/ipp-20130207/ippToPsps/jython/objectbatch.py

@@ -54 +54 @@
 
        try:
-           self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb.dbName)
+           ## XX pass in the existing connection to scratchDb
+           self.dvoObjects = DvoObjects(self.logger, self.config, self.skychunk, self.ippToPspsDb, self.scratchDb)
        except:
            self.logger.errorPair("Unable to create instance of", "DvoObjects")
@@ -77 +78 @@
         else:
             self.dvoObjects.ingestRegion(self.region)
+
+        cptTableName = self.scratchDb.getDbFriendlyTableName(self.region + ".cpt")
+        if not self.scratchDb.tableExists(cptTableName):
+            return False
 
         return True
@@ -252 +257 @@
                ,dataRelease \
                ,Random \
+               ,batchID \
                ) \
                SELECT \
@@ -268 +274 @@
                , " + str(self.skychunk.dataRelease) + "\
                , RAND() \
+               , " + str(self.batchID) + "\
                FROM " + cptTableName