Index: /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py
===================================================================
--- /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py	(revision 8766)
+++ /main/waeup.kofa/trunk/src/waeup/kofa/applicants/interfaces.py	(revision 8767)
@@ -33,5 +33,5 @@
 from waeup.kofa.payments.interfaces import IOnlinePayment
 from waeup.kofa.schema import PhoneNumber
-from waeup.kofa.students.vocabularies import GenderSource
+from waeup.kofa.students.vocabularies import GenderSource, RegNumberSource
 from waeup.kofa.university.vocabularies import AppCatSource, CertificateSource
 
@@ -48,30 +48,15 @@
     pass
 
-class RegNumberSource(object):
-    implements(ISource)
+class ApplicantRegNumberSource(RegNumberSource):
+    """A source that accepts any reg number if not used already by a
+    different applicant.
+    """
     cat_name = 'applicants_catalog'
     field_name = 'reg_number'
     validation_error = RegNumInSource
-    def __init__(self, context):
-        self.context = context
-        return
-
-    def __contains__(self, value):
-        cat = queryUtility(ICatalog, self.cat_name)
-        if cat is None:
-            return True
-        kw = {self.field_name: (value, value)}
-        results = cat.searchResults(**kw)
-        for entry in results:
-            if entry.applicant_id != self.context.applicant_id:
-                # XXX: sources should simply return False.
-                #      But then we get some stupid error message in forms
-                #      when validation fails.
-                raise self.validation_error(value)
-                #return False
-        return True
+    comp_field = 'applicant_id'
 
 def contextual_reg_num_source(context):
-    source = RegNumberSource(context)
+    source = ApplicantRegNumberSource(context)
     return source
 directlyProvides(contextual_reg_num_source, IContextSourceBinder)
