X-Git-Url: https://git.ucc.asn.au/?p=uccvend-vendserver.git;a=blobdiff_plain;f=sql-edition%2Fservers%2FMIFAREClient.py;h=e0b6a6c83eed31f73bdbc6b1194b60adac73baee;hp=358f550bd8cfb10e95c4ef468b82a092b6295f12;hb=15bf186b639b1ee317eb780c7a85fd2a1de50efe;hpb=07137a6ba9397180f6edb5b61a74bb6c18746811;ds=sidebyside

diff --git a/sql-edition/servers/MIFAREClient.py b/sql-edition/servers/MIFAREClient.py
index 358f550..e0b6a6c 100644
--- a/sql-edition/servers/MIFAREClient.py
+++ b/sql-edition/servers/MIFAREClient.py
@@ -9,7 +9,7 @@ class MIFAREClient:
         self.reader.set_led(red = False, green = True)
         self.reader.beep(100)
     
-    def get_card(self):
+    def get_card_id(self):
         self.reader.set_led(red = True, green = False)
         try:
             card_id, capacity = self.reader.select_card()
@@ -21,6 +21,13 @@ class MIFAREClient:
             self.reader.beep(100)
             return card_id
     
+    def get_card_uid(self):
+		card_id = self.get_card_id()
+		if card_id == None:
+			return None
+		else:
+			return get_uid(card_id)
+    
     def add_card(self, uid):
         self.reader.set_led(red = True, green = False)
         for attempt in range(5):
@@ -30,8 +37,8 @@ class MIFAREClient:
             except MIFAREException:
                 pass
             else:
-                set_card_id(card_id, uid)
+                set_card_id(uid, card_id)
                 self.reader.set_led(red = False, green = True)
                 return True
         self.reader.set_led(red = False, green = True)
-        return False
\ No newline at end of file
+        return False