Changeset 5815

Timestamp:

7 Mar 2011, 13:35:22 (14 years ago)

Author:

uli

Message:

Fix get_applicant_data to reflect new structure of applicant
containers, applicants root and the like.

File:

• main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py (modified) (2 diffs)

main/waeup.sirp/trunk/src/waeup/sirp/applicants/root.py

@@ -108 +108 @@
         return
 
-def get_applicant_data(reg_no, ac):
-    """Validate credentials and return applicant data.
-    
-    Returns tuple ``(<APPLICANT_ENTRY>, <ACCESSCODE>) on
-    successful validation and ``None`` else.
+def get_applicant_data(identifier):
+    """Get applicant data associated with `identifier`.
 
-    We expect a JAMB registration number and an access code in format
+    Returns the applicant object if successful and ``None`` else.
+
+    As `identifier` we expect an access code in format
     like ``PREFIX-XXX-YYYYYYYY`` where ``PREFIX`` is something like
     ``APP`` or ``PUDE``, ``XXX`` the access code series and
@@ -120 +119 @@
     """
     site = grok.getSite()
-    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)
+    for container in site['applicants'].values():
+        applicant_data = container.get(identifier, None)
+        if applicant_data is not None:
+            return applicant_data
+    return None
 
 def application_exists(identifier):