View difference between Paste ID: uN2DwAjt and shJnELiv

 #!/usr/bin/env python
 
 import MySQLdb
 import MySQLdb.cursors
 
-class MCDataSource(object):
+# Class handling MasterControl Data
-	# Information about the database
+# Class is a singleton and takes care of making a connection to the db and creating a cursor
 # This is part of a pluggable architecture which simplifies use of different databases and other data sources
-	database = "ENTS"
+# To enable another database in MasterControl (e.g. postgreSQL)
-	table = "members"
+#	Clone MasterControlMySQL.py to MasterControlPostgres.py
-	hostaddr = "localhost"
+#       Adjust imports
-	username = "mastercontrol"
+#       Adjust database connection params in connect()
-	# TODO: This is insecure as it can be read by anyone with access to this script, needs to be handled in another way
+#       Adjust SQL statements where required (e.g. postgreSQL may have different syntax for joins...)
-	password = "pass"
+#       Remove MasterControlMySQL.py from application path and rerun RFIDServer
 # Using other data sources (flat files, excel...)
 #	Follow pattern as above and adjust subroutines to get data from other datasource/update other datasource
 #	Ensure routines returning a 'row' return an appropriate array of data
 
 # Example usage:
 # 	row = MCData().getMember( '117877', 'FobNumber' )
-		>>> s = Singleton()
+
-		>>> p = Singleton()
+class MCData(object):
 	conn = None
 	cursor = None
 
 	"""Use to create a singleton"""
 	def __new__(cls, *args, **kwds):
 		"""
 		>>> s = MCData()
 		>>> p = MCData()
 		>>> id(s) == id(p)
 		True
 		"""
-		connect()
+
 		if not hasattr(cls, self):
-	def connect():
+
 			instance.init(*args, **kwds)
-        	self.cursor = conn.cursor()
+
 		return getattr(cls, self)
 
-	def close(conn, cursor):
+
 		self.connect()
 
 	def connect( self ):
 		# Information about the database
 		database = "ENTS"
-	def getLastUnlock( doorNum ):
+		table = "members"
-        	print "getLastUnlock connecting to db"
+		hostaddr = "localhost"
-		#conn, cursor = connect()
+		username = "mastercontrol"
-	       	#conn = MySQLdb.connect ( host = hostaddr, user = username, passwd = password, db = database, cursorclass=MySQLdb.cursors.DictCursor )
+		# TODO: This is insecure as it can be read by anyone with access to this script, needs to be handled in another way
-	        #cursor = conn.cursor()                          #connect to users db
+		password = "pass"
-        	print "connection cursor created"
+
         	self.cursor = self.conn.cursor()
 		#return conn, cursor
 
 	def close( self, conn, cursor ):
 		self.cursor.close()
-		#close(conn, cursor)
+
 
 	# Go to the database and get the last unlock event for the given door number
 	# We match FobNumber on the members table with CardNum on the DoorLog table and search based on door number
-	def getMember( fobNumber, fobField ):
+	def getLastUnlock( self, doorNum ):
-        	#conn = MySQLdb.connect ( host = hostaddr, user = username, passwd = password, db = database, cursorclass=MySQLdb.cursors.DictCursor )
+        	print "getLastUnlock"
-        	#cursor = conn.cursor()                          #connect to users db
+
-		print "getMember connecting to db"
+
-		#conn, cursor = connect()
+
 		print "getLastUnlock returning row:"
 		print row
         	return row
 
 	def getMember( self, fobNumber, fobField ):
 		print "getMember"
         	self.cursor.execute ("SELECT * from members where "+fobField+" = '" + fobNumber+"'")
         	try:
         		row = self.cursor.fetchone()                 #get the record for the current cardnum
         	except ValueError:              #Exception:
-        	#close the mysql connection
+
-       		#close(conn, cursor)
+
                 	print "Major Failure \n"
                 	#print Exception
-	def createDoorLogFail( fobNumber, doorNumber, cmd ):
+
-		print "createDoorLogFail connecting to db"
+
-		#conn, cursor = connect()
+	def createDoorLogFail( self, fobNumber, doorNumber, cmd ):
 		print "createDoorLogFail"
 		self.cursor.execute("insert into DoorLog values ("+fobNumber+
         	",'"+fobNumber+" Not in database: "+cmd+
-		#close(conn, cursor)
+
 
-	def createDoorLogAdmit( fobNumber, firstName, lastName, doorNumber):
+	def createDoorLogAdmit( self, fobNumber, firstName, lastName, doorNumber):
-		print "createDoorLogAdmit connecting to db"
+		print "createDoorLogAdmit"
-		#conn, cursor = connect()
+
         	",'"+firstName+" "+lastName+" unlocked door "+doorNumber+
         	"','"+doorNumber+"',now(),NULL)")
 
-		#close(conn, cursor)
+	def getSeconds( self, lastUnlock ):
 		print "getSeconds"
-	def getSeconds( lastUnlock ):
+
-		print "getSeconds connecting to db"
+
-		#conn, cursor = connect()
+
 			seconds = 2000
 		return seconds
 
 	def updateMember( self, fobNumber, fobField, lastUnlockField ):
-		#close(conn, cursor)
+		print "updateMember"
 		self.cursor.execute("update members set "+lastUnlockField+" =  now() where "+fobField+" = '"+fobNumber+"'")