Changeset 35235 for branches/eam_branches/ipp-20130207/ippToPsps/jython/scratchdb.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/scratchdb.py (modified) (4 diffs)

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

@@ -19 +19 @@
     Constructor
     '''
-    def __init__(self, logger, config, dbVersion, dbName=None):
+    def __init__(self, logger, config):
 
         # create gpc1 database objects
+        # XXX the test option is probably not needed since
+        # the scratchDb config infor is set up specially
         if (config.test): 
             dbType = "localdatabase_test"
@@ -27 +29 @@
             dbType = "localdatabase"
 
-        if not dbName:
-            dbName = config.getDbName(dbType)
-            dbName += dbVersion
+        print "trying to connect: ", dbType
+
+        dbName = config.getDbName(dbType)
 
         super(ScratchDb, self).__init__(logger, config, dbType, dbName)
@@ -432 +434 @@
     def purgeTheseDvoRegions(self, regions, fileTypes):
 
-        detectionCount = self.getRowCount(self.dvoDetectionTable)
+        # XXX this must have been a remnant from something else: we are deleting a region, not entries from the dvoDetectionTable
+        # detectionCount = self.getRowCount(self.dvoDetectionTable)
         for region in regions:
           
@@ -448 +451 @@
                     pass
 
-        deletedDetectionCount = detectionCount - self.getRowCount(self.dvoDetectionTable)
+        # deletedDetectionCount = detectionCount - self.getRowCount(self.dvoDetectionTable)
 
         # after a big detection delete, we should OPTIMIZE the table
-        if deletedDetectionCount > 0:
-            self.logger.infoPair("Running OPTIMIZE on ", self.dvoDetectionTable)
-            self.optimizeTable(self.dvoDetectionTable)
-
-        return deletedDetectionCount
+        # if deletedDetectionCount > 0:
+        #     self.logger.infoPair("Running OPTIMIZE on ", self.dvoDetectionTable)
+        #     self.optimizeTable(self.dvoDetectionTable)
+
+        return 1
            
     '''