From: Bernard Blackham <dagobah@ucc.asn.au>
Date: Sun, 31 Oct 2004 09:29:47 +0000 (+0000)
Subject: allow dispensing of actual snacks.
X-Git-Tag: IMPORT-FROM-UCCCVS~53
X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=commitdiff_plain;h=9d8efc1cb0e6feb12340dd9c50dedf32d98c3c1a

allow dispensing of actual snacks.
fix timeout bug.
---

diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py
index 8c5ab73..03a7bf5 100755
--- a/sql-edition/servers/VendServer.py
+++ b/sql-edition/servers/VendServer.py
@@ -277,6 +277,7 @@ def run_forever(rfh, wfh, options, cf):
 		if len(cur_pin) == PIN_LENGTH and mk.done() and time_to_autologout == None:
 			# start autologout
 			time_to_autologout = time() + 15
+			last_timeout_refresh = None
 
 		if time_to_idle == None and cur_user == '':
 			time_to_idle = time() + 5
@@ -406,15 +407,21 @@ def run_forever(rfh, wfh, options, cf):
 						continue
 					elif cur_selection[1] == '8':
 						v.display('GOT COKE?')
-						os.system('su - "%s" -c "dispense %s"'%(username, cur_selection[0]))
+						if ((os.system('su - "%s" -c "dispense %s"'%(username, cur_selection[0])) >> 8) != 0):
+							v.display('SEEMS NOT')
+						else:
+							v.display('GOT COKE!')
 					else:
-						v.display('HERES A '+cur_selection)
-						v.vend(cur_selection)
-					sleep(0.5)
-					v.display('THANK YOU')
-					sleep(0.5)
+						v.display(cur_selection+' - $1.00')
+						if ((os.system('su - "%s" -c "dispense snack"'%(username)) >> 8) == 0):
+							v.vend(cur_selection)
+							v.display('THANK YOU')
+						else:
+							v.display('NO MONEY?')
+					sleep(1)
 					cur_selection = ''
 					time_to_autologout = time() + 8
+					last_timeout_refresh = None
 
 def connect_to_vend(options, cf):
 	# Open vending machine via serial.