X-Git-Url: https://git.ucc.asn.au/?a=blobdiff_plain;f=sql-edition%2Fservers%2FVendingMachine.py;h=d7e7a8f8e1b430e3d984460da5596b10edc654bf;hb=7c3379cae4ca6e0fbe09db062aaa31511ab6efe7;hp=9506daf0599b8c2d0b44697c32e2c6466ea98f87;hpb=37123733790f1525161256cfabd1da877bf37e74;p=uccvend-vendserver.git

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index 9506daf..d7e7a8f 100644
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -2,7 +2,7 @@
 import re
 from CRC import do_crc
 from select import select
-import socket
+import socket, logging
 
 asynchronous_responses = [	'400', '401', # door open/closed
 				'610',        # switches changed
@@ -42,9 +42,9 @@ class VendingMachine:
 			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 != '#' and s != '%') and state == 1: prefix += s
 			if s == '\n' or s == '\r':
 				state = 1
 				prefix = ''
@@ -97,7 +97,7 @@ class VendingMachine:
 		elif code[0] == '2':
 			self.events.append((KEY, int(code[1:3])))
 		else:
-			sys.stderr.write('WARNING: Unhandled event! (%s %s)\n'%(code,text))
+			logging.warning('Unhandled event! (%s %s)\n'%(code,text))
 
 	def authed_message(self, message):
 		if self.challenge == None:
@@ -115,7 +115,7 @@ class VendingMachine:
 	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'))
+		self.wfh.write(self.authed_message(('V%s'%item))+'\n')
 		(code, string) = self.get_response()
 		return (code == '100', code, string)