Changeset 33948 for branches/eam_branches/ipp-20120405/ippToPsps/jython/dvo.py

Timestamp:

May 29, 2012, 5:07:20 PM (14 years ago)

Author:

eugene

Message:

merging changes from trunk

File:

• branches/eam_branches/ipp-20120405/ippToPsps/jython/dvo.py (modified) (6 diffs)

branches/eam_branches/ipp-20120405/ippToPsps/jython/dvo.py

@@ -17 +17 @@
 from java.sql import *
 
-
 '''
 Abstract base-class for DVO classes
@@ -48 +47 @@
        
         # connect to the specified scratch database
-        self.scratchDb = ScratchDb(self.logger, self.config, scratchDbName)
+        try:
+            self.scratchDb = ScratchDb(self.logger, self.config, scratchDbName)
+        except: raise
+
         self.scratchDb.setUseFullTables(True)
 
@@ -90 +92 @@
             return
 
-
     '''
     Loads the DVO Photcodes.dat FITS file
@@ -218 +219 @@
         self.regionsAlreadyIngested = []
         self.regionsIngestedButOutOfDate = []
+        tablesToCleanup = []
 
         # loop through all regions in DVO inside this bounding-box
@@ -256 +258 @@
                continue
 
+           # we have no record of ingesting this region, but does the table exist? 
+           # May hev been left behind after a crash, and therefore needs to be cleaned-up
+           for fileType in self.ingestFileTypes:
+               tableName = self.scratchDb.getDbFriendlyTableName(regionPath + "." + fileType)
+               if self.scratchDb.tableExists(tableName):
+                   tablesToCleanup.append(tableName)
+
            # check if we have out-of-date versions of any interested files, if so, add region to the purge list
            outOfDate = False
@@ -279 +288 @@
         self.sizeOfRegionsToPurge = self.getDiskSizeOfRegions(self.regionsToPurge)
         self.sizeOfRegionsToIngest = self.getDiskSizeOfRegions(self.regionsToIngest)
+
+        # any tables need cleaning up?
+        if len(tablesToCleanup) > 0:
+            self.logger.infoPair("Found tables to be cleaned up", "%d" % len(tablesToCleanup))
+            self.scratchDb.dropTables(tablesToCleanup)
+            
 
     '''