Changeset e5c5180

Timestamp:

Feb 11, 2014, 2:05:46 AM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

ff71c3a, 8442dd7

Parents:

4193cf3 (diff), 86986f5 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

git-author:

Alex Dehnert <adehnert@…> (02/11/14 02:05:46)

git-committer:

Alex Dehnert <adehnert@…> (02/11/14 02:05:46)

Message:

Fixes to the people lookup tool

Merge branch 'people-lookup'

• people-lookup: People lookup: Handle more name formats (ASA-#253) People lookup: specify intended format (ASA-#253) People lookup: handle round numbers (ASA-#253) People lookup: force names to lowercase (ASA-#252)

File:

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

asadb/forms/models.py

@@ -3 +3 @@
 import json
 import os
+import re
 
 import ldap
@@ -213 +214 @@
 
 class PeopleStatusLookup(models.Model):
-    people = models.TextField(help_text="Enter some usernames or email addresses to look up here.")
+    people = models.TextField(help_text="Enter some usernames or email addresses, separated by newlines, to look up here.")
     requestor = models.ForeignKey(User, null=True, blank=True, )
     referer = models.URLField(blank=True)
@@ -234 +235 @@
             username_chunks.append(usernames[start:end])
             start = end
-        username_chunks.append(usernames[end:])
-        print username_chunks
+        extra = usernames[end:]
+        if extra:
+            username_chunks.append(extra)
 
         results = []
@@ -244 +246 @@
             results.extend(batch_results)
 
-        left = set(usernames)
+        left = set([u.lower() for u in usernames])
         undergrads = []
         grads = []
@@ -259 +261 @@
         for result in results:
             username = result[1]['uid'][0]
-            left.remove(username)
+            left.remove(username.lower())
             affiliation = result[1].get('eduPersonAffiliation', ['secret'])[0]
             if affiliation == 'student':
@@ -297 +299 @@
         return results
 
+    def split_people(self):
+        splitted = re.split(r'[\n,]+', self.people)
+        people = []
+        for name in splitted:
+            name = name.strip()
+            if len(name) > 2 and (name[0] == '(') and (name[-1] == ')'):
+                name = name[1:-1]
+            name = name.replace(' at ', '@')
+            if name:
+                people.append(name)
+        return people
+
     def update_classified_people(self):
-        people = [p for p in [p.strip() for p in self.people.split('\n')] if p]
+        people = self.split_people()
         self._classified_people = self.classify_people(people)
         self.classified_people_json = json.dumps(self._classified_people)