X-Git-Url: https://git.ucc.asn.au/?p=zanchey%2Fdispense2.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendingMachine.py;h=9fe524519e7666579c09245f6110fbcc0050fe24;hp=52b66cf00e23afd827af54530e3a3c9f2a30ca37;hb=44268d2fe00aff222bd83753739d9f9728632e2e;hpb=356b151a7886090c530488f1ced311130923cbbc

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index 52b66cf..9fe5245 100644
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -1,5 +1,5 @@
 # vim:ts=4
-import re, pg
+import re
 from CRC import do_crc
 from select import select
 
@@ -12,6 +12,8 @@ DOOR = 1
 SWITCH = 2
 KEY = 3
 
+class VendingException(Exception): pass
+
 class VendingMachine:
 	def __init__(self, rfh, wfh):
 		self.events = []
@@ -27,7 +29,7 @@ class VendingMachine:
 		self.wfh.write('PING\n')
 		code = ''
 		while code != '000':
-			(code, _) = self.get_response()
+			code = self.get_response()[0]
 		self.get_switches()
 
 	def await_prompt(self):
@@ -36,8 +38,12 @@ class VendingMachine:
 		prefix = ''
 		s = ''
 		while True:
-			s = self.rfh.read(1)
-			if s == '': raise Exception('nothing read!')
+			try:
+				s = self.rfh.read(1)
+			except socket.error:
+				print "Blah, seems DEC server has fallen over"
+				raise VendingException('failed to read input from vending machine')
+			if s == '': raise VendingException('nothing read!')
 			if s == '\n' or s == '\r':
 				state = 1
 				prefix = ''
@@ -131,8 +137,7 @@ class VendingMachine:
 			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)
+		return (code == '501', code, string)
 
 	def display(self, string):
 		if len(string) > 10:
@@ -149,6 +154,7 @@ class VendingMachine:
 			(r, _, _) = select([self.rfh], [], [], timeout)
 			if r:
 				self.get_response(async = True)
+				timeout = 0
 			else:
 				break
 		if len(self.events) == 0: return None