git.ucc.asn.au
/
zanchey
/
dispense2.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix bugs in last few commits
[zanchey/dispense2.git]
/
sql-edition
/
servers
/
VendingMachine.py
diff --git
a/sql-edition/servers/VendingMachine.py
b/sql-edition/servers/VendingMachine.py
index
dcafac4
..
9506daf
100644
(file)
--- a/
sql-edition/servers/VendingMachine.py
+++ b/
sql-edition/servers/VendingMachine.py
@@
-1,7
+1,8
@@
# vim:ts=4
# vim:ts=4
-import re
, pg
+import re
from CRC import do_crc
from select import select
from CRC import do_crc
from select import select
+import socket
asynchronous_responses = [ '400', '401', # door open/closed
'610', # switches changed
asynchronous_responses = [ '400', '401', # door open/closed
'610', # switches changed
@@
-12,6
+13,8
@@
DOOR = 1
SWITCH = 2
KEY = 3
SWITCH = 2
KEY = 3
+class VendingException(Exception): pass
+
class VendingMachine:
def __init__(self, rfh, wfh):
self.events = []
class VendingMachine:
def __init__(self, rfh, wfh):
self.events = []
@@
-27,7
+30,7
@@
class VendingMachine:
self.wfh.write('PING\n')
code = ''
while code != '000':
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):
self.get_switches()
def await_prompt(self):
@@
-36,8
+39,12
@@
class VendingMachine:
prefix = ''
s = ''
while True:
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 = ''
if s == '\n' or s == '\r':
state = 1
prefix = ''
@@
-56,7
+63,8
@@
class VendingMachine:
s = ''
while s == '':
s = self.rfh.readline()
s = ''
while s == '':
s = self.rfh.readline()
- if s == '': return None
+ if s == '':
+ raise VendingException('Input socket has closed!')
s = s.strip('\r\n')
code = s[0:3]
text = s[4:]
s = s.strip('\r\n')
code = s[0:3]
text = s[4:]
@@
-131,8
+139,7
@@
class VendingMachine:
msg += '%02x'%duration
self.wfh.write(msg+'\n')
(code, string) = self.get_response()
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:
def display(self, string):
if len(string) > 10:
UCC
git Repository :: git.ucc.asn.au