Changeset 33553 for trunk/ippToPsps

Timestamp:

Mar 16, 2012, 12:04:00 PM (14 years ago)

Author:

rhenders

Message:

scratch Db now checked at start up; better user prompting

File:

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

trunk/ippToPsps/jython/dvo.py

@@ -34 +34 @@
 
     '''
-    def __init__(self, logger, config):
+    def __init__(self, logger, config, scratchDbName):
 
         # set up logging
@@ -46 +46 @@
         self.regionsAlreadyIngested = []
         self.regionsIngestedButOutOfDate = []
-        
-        #self.correctDvo = False
-
-
-    '''
-    Connects to the scratch database with the provided name, if not already connected
-    '''
-    def setScratchDb(self, dbName):
-
-        # if we're already connected to this database, then get out of here
-        try:
-            if self.scratchDb.dbName == dbName: return
-        except: pass
-
-        self.scratchDb = ScratchDb(self.logger, self.config, dbName)
+       
+        # connect to the specified scratch database
+        self.scratchDb = ScratchDb(self.logger, self.config, scratchDbName)
         self.scratchDb.setUseFullTables(True)
 
-        # decide if we are using the right DVO
+        self.checkDvoLocation()
+
+    '''
+    Checks whether scratch Db is using DVO Db specified in the config
+    '''
+    def checkDvoLocation(self):
+
+        # decide if we are using the right DVO for this scratchDb
         self.correctDvo = self.scratchDb.isCorrectDvo(self.config.dvoLocation)
 
+        # this scratch Db either has no DVO info ingested, or a different DVO ingested. Prompt user
         if not self.correctDvo:
             print "*******************************************************************************"
-            response = raw_input("**** Wrong or no DVO in use. Do you want to reset and use '" + self.config.dvoLocation + "' (y/n)? ")
+            self.logger.warning("Wrong or no DVO in use. Do you want to reset and use '" + self.config.dvoLocation + "'?")
+            response = raw_input("(y/n) ")
             if response == "y":
-                response = raw_input("**** Are you ABSOLUTELY sure you want to do this? (y/n)? ")
+                self.logger.warning("Are you ABSOLUTELY sure you want to do this?")
+                response = raw_input("(y/n) ")
                 if response == "y":
                     self.resetAllTables()
+
 
     '''