Changeset 33259 for trunk/ippToPsps/jython/mysql.py

Timestamp:

Feb 14, 2012, 12:02:48 PM (14 years ago)

Author:

rhenders

Message:

Big changes to support a new Config class that encapuslates the xml config file

File:

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

trunk/ippToPsps/jython/mysql.py

@@ -21 +21 @@
 
     '''
-    def __init__(self, logger, doc, dbType):
+    def __init__(self, logger, config, dbType):
 
         # set up logging
         self.logger = logger
-        self.doc = doc
+        self.config = config
         self.logger.debug("MySql class constructor")
 
         # open config and grab database parameters
-        self.dbName = self.doc.find(dbType +"/name").text
-        self.dbHost = self.doc.find(dbType +"/host").text
-        self.dbUser = self.doc.find(dbType +"/user").text
-        self.dbPass = self.doc.find(dbType +"/password").text
+        self.dbName = config.getDbName(dbType)
+        self.dbHost = config.getDbHost(dbType)
+        self.dbUser = config.getDbUser(dbType)
+        self.dbPass = config.getDbPassword(dbType)
 
         # set up JDBC connection
@@ -80 +80 @@
         connectionID = self.getLastConnectionID()
         if connectionID == self.connectionID:
-            self.logger.error("NOT going to kill THIS connection ID")
+            self.logger.debug("NOT going to kill THIS connection ID")
             return