Changeset 33185

Timestamp:

Jan 31, 2012, 4:27:16 PM (14 years ago)

Author:

rhenders

Message:

now dropping SkyTable and Images tables when resetting DVO tables; renamed method that checks we are using correct DVO

File:

• trunk/ippToPsps/jython/scratchdb.py (modified) (3 diffs)

trunk/ippToPsps/jython/scratchdb.py

@@ -313 +313 @@
     Checks whether DVO files we have ingested are form the DVO path provided
     '''
-    def isThisDvoCurrentlyIngested(self, path):
+    def isCorrectDvo(self, path):
 
         sql = "SELECT path FROM " + self.dvoDoneTable + " where path LIKE '%Images.dat'"
@@ -331 +331 @@
         except:
             self.logger.errorPair("No DVO files ingested for this path", path)
-            return False
+            return True
 
     '''
@@ -465 +465 @@
        self.logger.infoPair("Dropping table", self.dvoDetectionTable)
        self.dropTable(self.dvoDetectionTable)
+       self.logger.infoPair("Dropping table", self.dvoSkyTable)
+       self.dropTable(self.dvoSkyTable) 
        self.logger.infoPair("Dropping table", self.dvoDoneTable)
        self.dropTable(self.dvoDoneTable) 
+       self.logger.infoPair("Dropping table", self.dvoImageTable)
+       self.dropTable(self.dvoImageTable) 
 
        self.logger.infoPair("Creating table", self.dvoMetaTable)