Changeset 33781 for trunk

Timestamp:

Apr 13, 2012, 2:11:59 PM (14 years ago)

Author:

rhenders

Message:

now, when setting a sky area, checks for ingested DVO files that are not listed in dvoDone and drops them

File:

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

trunk/ippToPsps/jython/dvo.py

@@ -16 +16 @@
 from java.lang import *
 from java.sql import *
-
 
 '''
@@ -90 +89 @@
             return
 
-
     '''
     Loads the DVO Photcodes.dat FITS file
@@ -218 +216 @@
         self.regionsAlreadyIngested = []
         self.regionsIngestedButOutOfDate = []
+        self.tablesToCleanup = []
 
         # loop through all regions in DVO inside this bounding-box
@@ -256 +255 @@
                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 +285 @@
         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)
+            
 
     '''