From: Matt Johnston Date: Thu, 18 Aug 2005 12:18:20 +0000 (+0000) Subject: Put the slot number after the drink name/price X-Git-Tag: IMPORT-FROM-UCCCVS~27 X-Git-Url: https://git.ucc.asn.au/?a=commitdiff_plain;h=1886ae396a34a4b35c2306ecc1f085f8bc939c97;p=uccvend-vendserver.git Put the slot number after the drink name/price --- diff --git a/sql-edition/servers/VendServer.py b/sql-edition/servers/VendServer.py index 9792c56..ccee841 100755 --- a/sql-edition/servers/VendServer.py +++ b/sql-edition/servers/VendServer.py @@ -105,7 +105,7 @@ def scroll_options(username, mk, welcome = False): c = c.strip() (slot_num, price, slot_name) = c.split(' ', 2) if slot_name == 'dead': continue - choices += '%s8-%s (%sc) '%(slot_num, slot_name, price) + choices += '%s-(%sc)-%s8'%(slot_name, price, slot_num) # we don't want to print snacks for now since it'll be too large # and there's physical bits of paper in the machine anyway - matt @@ -215,7 +215,7 @@ def setup_idlers(v): GrayIdler(v,one="/",zero="\\",reorder=1), StringIdler(v, text=str(math.e) + " "), GrayIdler(v,one="X",zero="O",reorder=1), - StringIdler(v, text=" I want some pizza - please call Pizza Hut Shenton Park on +61 8 9381 9979 - and order as Quinn - I am getting really hungry", repeat=False), + StringIdler(v, text=" I want some pizza - please call Pizza Hut Shenton Park on +61 8 9381 9979 [now closed? - MSH] - and order as Quinn - I am getting really hungry", repeat=False), PipeIdler(v, "/usr/bin/getent", "passwd"), FortuneIdler(v), ClockIdler(v),