From 92180be67b07c7f31d2306069c686e83bc1f162d Mon Sep 17 00:00:00 2001 From: Cameron Patrick Date: Sat, 31 Jul 2004 09:48:34 +0000 Subject: [PATCH] move code to connect to vending machine into a separate function --- sql-edition/servers/VendServer.py | 33 +++++++++++++++++-------------- 1 file changed, 18 insertions(+), 15 deletions(-) diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index 125de02..a2cdfba 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -361,6 +361,22 @@ def run_forever(rfh, wfh): cur_selection = '' time_to_autologout = time() + 8 +# FIXME: a less ugly way of passing all these options would be nice +def connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword): + # Open vending machine via LAT + if options.use_lat: + latclient = LATClient(service = ServiceName, password = ServicePassword) + rfh, wfh = latclient.get_fh() + else: + #(rfh, wfh) = popen2('../../virtualvend/vvend.py') + import socket + sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) + sock.connect((options.host, options.port)) + rfh = sock.makefile('r') + wfh = sock.makefile('w') + + return rfh, wfh + if __name__ == '__main__': from ConfigParser import ConfigParser from optparse import OptionParser @@ -370,7 +386,7 @@ if __name__ == '__main__': op.add_option('-v', '--virtualvend', action='store_false', default=True, dest='use_lat', help='use the virtual vending server instead of LAT') op.add_option('-n', '--hostname', dest='host', default='localhost', help='the hostname to connect to for virtual vending machine mode (default: localhost)') op.add_option('-p', '--port', dest='port', default=5150, type='int', help='the port number to connect to (default: 5150)') - (options, args) = op.parse_args() + options, args = op.parse_args() if len(args) != 0: op.error('extra command line arguments: ' + ' '.join(args)) @@ -384,19 +400,6 @@ if __name__ == '__main__': ServiceName = cp.get('VendingMachine', 'ServiceName') ServicePassword = cp.get('VendingMachine', 'Password') - - - -# # Open vending machine via LAT - if options.use_lat: - latclient = LATClient(service = ServiceName, password = ServicePassword) - (rfh, wfh) = latclient.get_fh() - else: - #(rfh, wfh) = popen2('../../virtualvend/vvend.py') - import socket - sock = socket.socket(socket.AF_INET, socket.SOCK_STREAM, 0) - sock.connect((options.host, options.port)) - rfh = sock.makefile('r') - wfh = sock.makefile('w') + rfh, wfh = connect_to_vend(options, DBServer, DBName, DBUser, DBPassword, ServiceName, ServicePassword) run_forever(rfh, wfh) -- 2.20.1