Changeset 6749 for main/waeup.sirp

Timestamp:

13 Sep 2011, 15:46:34 (13 years ago)

Author:

Henrik Bettermann

Message:

Avoid overkill during batch creation of students.

Location:

main/waeup.sirp/trunk/src/waeup/sirp/students

Files:

• student.py (modified) (2 diffs)
• utils.py (modified) (1 diff)

main/waeup.sirp/trunk/src/waeup/sirp/students/student.py

@@ -19 +19 @@
 import grok
 from grok import index
-from zope.component.interfaces import IFactory, ComponentLookupError
+from zope.component.interfaces import IFactory
 from zope.interface import implementedBy
 from hurry.workflow.interfaces import IWorkflowInfo, IWorkflowState
@@ -40 +40 @@
         super(Student, self).__init__()
         IWorkflowInfo(self).fireTransition('create')
-        # The catalog doesn't exist in unit tests
+        # The site doesn't exist in unit tests
         try:
-            self.student_id = generate_student_id('?')
-        except ComponentLookupError:
+            students = grok.getSite()['students']
+            self.student_id = generate_student_id(students,'?')
+        except TypeError:
             self.student_id = u'Z654321'
         self.password = None

main/waeup.sirp/trunk/src/waeup/sirp/students/utils.py

@@ -3 +3 @@
 
 from random import SystemRandom as r
-from waeup.sirp.students.catalog import search
 
-def generate_student_id(letter):
-    # XXX: using catalog search here might be overkill?
+def generate_student_id(students,letter):
     if letter == '?':
         letter= r().choice('ABCDEFGHKLMNPQRSTUVWXY')
     sid = u"%c%d" % (letter,r().randint(99999,1000000))
-    while search(query=sid,searchtype='student_id'):
+    while sid in students.keys():
         sid = u"%c%d" % (letter,r().randint(99999,1000000))
     return sid