Index: /main/waeup.sirp/branches/ulif-fasttables/src/waeup/sirp/jambtables/browser.py
===================================================================
--- /main/waeup.sirp/branches/ulif-fasttables/src/waeup/sirp/jambtables/browser.py	(revision 5324)
+++ /main/waeup.sirp/branches/ulif-fasttables/src/waeup/sirp/jambtables/browser.py	(revision 5325)
@@ -29,4 +29,5 @@
 from waeup.sirp.interfaces import IWAeUPObject
 from waeup.sirp.jambtables import JAMBDataTable
+from waeup.sirp.jambtables.util import get_applicant_data
 from waeup.sirp.jambtables.interfaces import IApplicant, IApplicantContainer
 
@@ -176,12 +177,8 @@
         We expect a JAMB registration number and an access code in
         format ``PUDE-XXX-XXXXXXXXXX``.
+
+        See
+        :func:`waeup.sirp.jambtables.util.get_applicant_data`
+        for details.
         """
-        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
-        return (applicant_data, entries[0])
+        return get_applicant_data(reg_no, ac)
