Changeset ed7ddec for asadb/forms/models.py

Timestamp:

Dec 3, 2013, 12:21:44 AM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

200ae4b

Parents:

d66942f

git-author:

Alex Dehnert <adehnert@…> (12/03/13 00:19:10)

git-committer:

Alex Dehnert <adehnert@…> (12/03/13 00:21:44)

Message:

People lookup: Support large numbers of people

File:

• asadb/forms/models.py (modified) (3 diffs)

asadb/forms/models.py

@@ -226 +226 @@
         fields = ['uid', 'eduPersonAffiliation', 'mitDirStudentYear']
 
-        filters = [ldap.filter.filter_format('(uid=%s)', [u]) for u in usernames]
-        userfilter = "(|%s)" % (''.join(filters), )
-        results = con.search_s(dn, ldap.SCOPE_SUBTREE, userfilter, fields)
+        chunk_size = 100
+        username_chunks = []
+        ends = range(chunk_size, len(usernames), chunk_size)
+        start = 0
+        for end in ends:
+            username_chunks.append(usernames[start:end])
+            start = end
+        username_chunks.append(usernames[end:])
+        print username_chunks
+
+        results = []
+        for chunk in username_chunks:
+            filters = [ldap.filter.filter_format('(uid=%s)', [u]) for u in chunk]
+            userfilter = "(|%s)" % (''.join(filters), )
+            batch_results = con.search_s(dn, ldap.SCOPE_SUBTREE, userfilter, fields)
+            results.extend(batch_results)
 
         left = set(usernames)
@@ -261 +274 @@
 
     def classify_people(self, people):
-        mit_usernames = set()
+        mit_usernames = []
         alum_addresses = []
         other_mit_addresses = []
@@ -269 +282 @@
             local, at, domain = name.partition('@')
             if domain.lower() == 'mit.edu' or domain == '':
-                mit_usernames.add(local)
+                mit_usernames.append(local)
             elif domain.lower() == 'alum.mit.edu':
                 alum_addresses.append((name, None))