X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FVendingMachine.py;h=d7e7a8f8e1b430e3d984460da5596b10edc654bf;hp=4a409221a536f2fed9dbef3273775c7ef7a56218;hb=9d8efc1cb0e6feb12340dd9c50dedf32d98c3c1a;hpb=7c61f2e7d593f845697c84ba52f7dc58045c78c6

diff --git a/sql-edition/servers/VendingMachine.py b/sql-edition/servers/VendingMachine.py
index 4a40922..d7e7a8f 100644
--- a/sql-edition/servers/VendingMachine.py
+++ b/sql-edition/servers/VendingMachine.py
@@ -44,6 +44,7 @@ class VendingMachine:
 			except socket.error:
 				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 = ''
@@ -114,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)