git.ucc.asn.au
/
uccvend-vendserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Move MIFARE database to dispense
[uccvend-vendserver.git]
/
VendServer
/
VendServer.py
diff --git
a/VendServer/VendServer.py
b/VendServer/VendServer.py
index
be8cea0
..
6dfbfe1
100755
(executable)
--- a/
VendServer/VendServer.py
+++ b/
VendServer/VendServer.py
@@
-19,7
+19,6
@@
from Idler import GreetingIdler,TrainIdler,GrayIdler,StringIdler,ClockIdler,Fort
from SnackConfig import get_snack#, get_snacks
import socket
from posix import geteuid
from SnackConfig import get_snack#, get_snacks
import socket
from posix import geteuid
-from LDAPConnector import get_uid,get_uname, set_card_id
from OpenDispense import OpenDispense as Dispense
CREDITS="""
from OpenDispense import OpenDispense as Dispense
CREDITS="""
@@
-815,15
+814,11
@@
class VendServer():
self._last_card_id = card_id
self._last_card_id = card_id
- res = self.dispense.addCard(card_id)
-
- if get_uid(card_id) != None:
+ if not self.dispense.addCard(card_id):
self.vstatus.mk.set_messages(
[(self.center('ALREADY'), False, 0.5),
(self.center('ENROLLED'), False, 0.5)])
else:
self.vstatus.mk.set_messages(
[(self.center('ALREADY'), False, 0.5),
(self.center('ENROLLED'), False, 0.5)])
else:
- logging.info('Enrolling card %s to uid %s (%s)'%(card_id, self.vstatus.cur_user, self.vstatus.username))
- self.set_card_id(self.vstatus.cur_user, self.card_id)
self.vstatus.mk.set_messages(
[(self.center('CARD'), False, 0.5),
(self.center('ENROLLED'), False, 0.5)])
self.vstatus.mk.set_messages(
[(self.center('CARD'), False, 0.5),
(self.center('ENROLLED'), False, 0.5)])
UCC
git Repository :: git.ucc.asn.au