Changeset 5468

Timestamp:

22 Aug 2010, 18:09:52 (14 years ago)

Author:

uli

Message:

Use external methods to handle accesscode-internal data stuff.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/jambtables/util.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/jambtables/util.py

@@ -23 +23 @@
 """
 import grok
+from waeup.sirp.accesscodes import get_access_code
 
 def get_applicant_data(reg_no, ac):
@@ -36 +37 @@
     """
     site = grok.getSite()
-    if reg_no not in site['applications'].keys():
-        return None
-    applicant_data = site['applications'][reg_no]
-    entries = site['accesscodes'].search(ac, 'pin')
-    if len(entries) != 1:
-        # XXX: If entries > 1 then we have a problem!
-        return None
-    # XXX: Maybe we have to mark reg_no as used here?
-    return (applicant_data, entries[0])
+    if reg_no is not None:
+        applicant_data = site['applications'].get(reg_no, None)
+    else:
+        # Non-JAMB-screened applicants are stored by ac as key...
+        applicant_data = site['applications'].get(ac, None)
+    access_code = get_access_code(ac)
+    return (applicant_data, access_code)
 
 def application_exists(identifier):