X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=sql-edition%2Fservers%2FVendServer.py;h=c3f04bcccf2026e63480b290722f196f7afaa200;hb=5b7731894d56c10c4deae2e23686742d790a8a27;hp=c6a9416c6957148e9048cdaa1cb3169ffcef7c93;hpb=d3ee0fb585f9df7ffa84987091f05b5a932b7e65;p=uccvend-vendserver.git

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index c6a9416..c3f04bc 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -1,120 +1,39 @@
 #!/usr/bin/python
 
 import sys, os, string, socket, time, re
-from popen2 import popen2
-from pyPgSQL import PgSQL
+import pg
 from LATClient import LATClient
-from CRC import do_crc
-from binascii import unhexlify
-
-asynchronous_responses = [	'400', '401', # door open/closed
-							'610',        # switches changed
-						 ]
-
-class VendingMachine:
-	def __init__(self, rfh, wfh):
-		self.secret = 'AAAAAAAAAAAAAAAA'
-		self.rfh = rfh
-		self.wfh = wfh
-		self.challenge = None
-		# Initialise ourselves into a known state
-		self.wfh.write('\n')
-		self.await_prompt()
-		self.wfh.write('echo off\n')
-		self.await_prompt()
-		self.wfh.write('PING\n')
-		code = ''
-		while code != '000':
-			(code, _) = self.get_response()
-
-	def await_prompt(self):
-		self.wfh.flush()
-		state = 1
-		prefix = ''
-		s = ''
-		while True:
-			s = self.rfh.read(1)
-			if s == '': raise Exception
-			if s == '\n' or s == '\r':
-				state = 1
-				prefix = ''
-			if (s == '#' or s == '%') and state == 1: state = 2
-			if s == ' ' and state == 2:
-				if prefix == '':
-					self.challenge = None
-					return
-				if re.search('^[0-9a-fA-F]{4}$', prefix):
-					self.challenge = unhexlify(prefix)
-					return
-
-	def get_response(self):
-		self.wfh.flush()
-		while True:
-			s = ''
-			while s == '':
-				s = self.rfh.readline()
-				if s == '': return None
-				s = s.strip('\r\n')
-			code = s[0:3]
-			text = s[4:]
-			if code in asynchronous_responses:
-				self.handle_event(code, text)
+from VendingMachine import VendingMachine
+
+class DispenseDatabase:
+	def __init__(self, vending_machine):
+		self.vending_machine = vending_machine
+		self.db = pg.DB(dbname = 'dispense', host = 'dispense.ucc.gu.uwa.edu.au', user = 'vendserver', passwd = 'revresdnev')
+		self.db.query('LISTEN vend_requests')
+
+	def process_requests(self):
+		print 'processing'
+		query = 'SELECT request_id, request_slot FROM vend_requests WHERE request_handled = false'
+		try:
+			outstanding = self.db.query(query).getresult()
+		except (pg.error,), db_err:
+			sys.stderr.write('Failed to query database: %s\n'%(db_err.strip()))
+			return
+		for (id, slot) in outstanding:
+			(worked, code, string) = self.vending_machine.vend(slot)
+			print (worked, code, string)
+			if worked:
+				query = 'SELECT vend_success(%s)'%id
+				self.db.query(query).getresult()
 			else:
-				self.await_prompt()
-				return (code, text)
-
-	def handle_event(self, code, text):
-		pass
-
-	def authed_message(self, message):
-		if self.challenge == None:
-			return message
-		crc = do_crc('%c%c'%(self.challenge >> 8, self.challenge & 0xff))
-		crc = do_crc(self.secret, crc)
-		crc = do_crc(message, crc)
-		return message+'|'+('%04x'%crc)
-
-	def ping(self):
-		self.wfh.write('PING\n')
-		(code, string) = self.get_response()
-		return (code == '000', code, string)
-
-	def vend(self, item):
-		if not re.search('^[0-9][0-9]$', item):
-			return (False, 'Invalid item requested (%s)'%item)
-		self.wfh.write(self.authed_message(('V%s\n'%item)+'\n'))
-		(code, string) = self.get_response()
-		return (code, string)
-
-	def beep(self, duration = None, synchronous = True):
-		msg = 'B'
-		if synchronous: msg += 'S'
-		if duration != None:
-			if duration > 255: duration = 255
-			if duration < 1: duration = 1
-			msg += '%02x'%duration
-		self.wfh.write(msg+'\n')
-		(code, string) = self.get_response()
-		return (code == '500', code, string)
-
-	def silence(self, duration = None, synchronous = True):
-		msg = 'C'
-		if synchronous: msg += 'S'
-		if duration != None:
-			if duration > 255: duration = 255
-			if duration < 1: duration = 1
-			msg += '%02x'%duration
-		self.wfh.write(msg+'\n')
-		(code, string) = self.get_response()
-		# FIXME: workaround a bug in rom W. should be just: return (code == '500', code, string)
-		return (code == '500' or code == '501', code, string)
+				query = 'SELECT vend_failed(%s)'%id
+				self.db.query(query).getresult()
 
-	def display(self, string):
-		if len(string) > 10:
-			string = string[0:10]
-		self.wfh.write('D'+string+'\n')
-		(code, string) = self.get_response()
-		return (code == '300', code, string)
+	def handle_events(self):
+		notifier = self.db.getnotify()
+		while notifier is not None:
+			self.process_requests()
+			notify = self.db.getnotify()
 
 if __name__ == '__main__':
 	# Open vending machine via LAT
@@ -122,7 +41,14 @@ if __name__ == '__main__':
 	(rfh, wfh) = latclient.get_fh()
 	v = VendingMachine(rfh, wfh)
 	print 'PING is', v.ping()
-	print 'BEEP is', v.beep()
-	print 'VEND 11 is', v.vend('11')
-	print 'SILENCE is', v.silence()
-	print 'DISPLAY is', v.display('GOOD NIGHT')
+	#print 'BEEP is', v.beep()
+	#print 'VEND 11 is', v.vend('11')
+	#print 'SILENCE is', v.silence()
+	#print 'DISPLAY is', v.display('WELCOME')
+	print 'S is', v.get_switches()
+
+	db = DispenseDatabase(v)
+	db.process_requests()
+	while True:
+		v.wait_for_events(1)
+		db.handle_events()