Changeset 31844

Timestamp:

Jul 8, 2011, 2:52:23 PM (15 years ago)

Author:

rhenders

Message:

now accepting config XML document to the constructor; using new logging method

File:

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

trunk/ippToPsps/jython/mysql.py

@@ -21 +21 @@
 
     '''
-    def __init__(self, logger, dbType):
+    def __init__(self, logger, doc, dbType):
 
         # set up logging
         self.logger = logger
+        self.doc = doc
         self.logger.debug("MySql class constructor")
 
         # open config and grab database parameters
-        doc = ElementTree(file="config.xml")
-        self.dbName = doc.find(dbType +"/name").text
-        self.dbHost = doc.find(dbType +"/host").text
-        self.dbUser = doc.find(dbType +"/user").text
-        self.dbPass = doc.find(dbType +"/password").text
+        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
 
         # set up JDBC connection
@@ -209 +209 @@
         rs.first()
         nBad = rs.getInt(1)
-        self.logger.info("%5d NULL %s values in table %s. Deleting." % (nBad, columnName, tableName))
 
         sql="DELETE from " + tableName + " WHERE " + columnName + " = " + value
         self.execute(sql)
+        self.logger.info("%s '%s' values in %s    %5d deleted" % (columnName, value, tableName, nBad))
 
     '''
@@ -223 +223 @@
         rs.first()
         nBad = rs.getInt(1)
-        self.logger.info("%5d NULL %s values in table %s. Deleting." % (nBad, columnName, tableName))
 
         sql="DELETE from " + tableName + " WHERE " + columnName + " IS NULL"
         self.execute(sql)
+        self.logger.infoPair("NULLs deleted from %s" % tableName, "%-5d %s" % (nBad, columnName))
 
     '''