Index: /WAeUP_SRP/base/WAeUPTool.py
===================================================================
--- /WAeUP_SRP/base/WAeUPTool.py	(revision 3263)
+++ /WAeUP_SRP/base/WAeUPTool.py	(revision 3264)
@@ -859,20 +859,24 @@
         students_folder = self.portal_url.getPortalObject().campus.students
         logger = logging.getLogger('WAeUPTool.admitOneStudent')
-        res = self.students_catalog(jamb_reg_no = brain.reg_no)
+        if brain.screening_type in ('cest','sandwich',):
+            reg_no = "%s%s/07" % (brain.course1,brain.serial)
+        else:
+            reg_no = brain.reg_no
+        res = self.students_catalog(jamb_reg_no = reg_no)
         if res:
-            logger.info('student with this reg_no already exists %s with id %s' % (brain.reg_no,res[0].id))
+            logger.info('student with this reg_no already exists %s with id %s' % (reg_no,res[0].id))
             return
         if brain.status != "admitted":
-            logger.info('status of %s is %s' % (brain.reg_no,brain.status))
+            logger.info('status of %s is %s' % (reg_no,brain.status))
             return
         pin_parts = brain.pin.split('-')
         if pin_parts and len(pin_parts) != 3:
-            logger.info('invalid pin %s for %s' % (brain.pin,brain.reg_no))
+            logger.info('invalid pin %s for %s' % (brain.pin,reg_no))
             return
         if brain.course_admitted not in self._v_certificates:
-            logger.info('certificate %s not found for %s' % (brain.course_admitted,brain.reg_no))
+            logger.info('certificate %s not found for %s' % (brain.course_admitted,reg_no))
             return
         if brain.sex not in (True,False):
-            logger.info('sex of %s not available' % (brain.reg_no))
+            logger.info('sex of %s not available' % (reg_no))
             return
         student_id = self.generateStudentId('?')
@@ -883,5 +887,5 @@
             self.makeStudentMember(student_id,password = password)
         student_object.manage_setLocalRoles(student_id, ['Owner',])
-        #logger.info("creating %s reg_no %s" % (student_id,brain.reg_no))
+        #logger.info("creating %s reg_no %s" % (student_id,reg_no))
         #
         # application
@@ -891,5 +895,5 @@
         #self.portal_workflow.doActionFor(application,'open',dest_container=application)
         da = {'Title': 'Application Data'}
-        da['jamb_reg_no'] = brain.reg_no
+        da['jamb_reg_no'] = reg_no
 
         sex = 'M'
