Changeset 33531

Timestamp:

Mar 15, 2012, 11:48:34 AM (14 years ago)

Author:

rhenders

Message:

now loading skytable whenever we have reset the database

File:

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

trunk/ippToPsps/jython/dvo.py

@@ -74 +74 @@
                     self.resetAllTables()
 
-
     '''
     Destructor
@@ -93 +92 @@
 
         self.logger.infoPair("Resetting", "all tables")
-        if not self.scratchDb.resetAllDvoTables(): return False
+        if not self.scratchDb.resetAllDvoTables(): return
         self.correctDvo = True
+        if not self.loadSkyTable():
+            self.correctDvo = False
+            return
+
 
     '''
@@ -158 +161 @@
        
         # go no further if we've already partly ingested a different DVO
-        if not self.correctDvo: return
+        if not self.correctDvo: return False
 
         path =  self.config.dvoLocation + "/SkyTable.fits"
         if self.scratchDb.alreadyImportedThisDvoTable(path): 
             self.logger.debugPair("DVO SkyTable.fits file", "up-to-date")        
-            return
+            return False
 
         self.logger.infoSeparator()
@@ -178 +181 @@
         self.scratchDb.setImportedThisDvoTable(path)
         self.logger.infoPair("Finished importing SkyTable at", self.config.dvoLocation)
+
+        return True
 
     '''