Changeset 86986f5

Timestamp:

Feb 11, 2014, 1:59:28 AM (12 years ago)

Author:

Alex Dehnert <adehnert@…>

Branches:

master, stable, stage

Children:

8442dd7

Parents:

4217b13

git-author:

Alex Dehnert <adehnert@…> (02/11/14 01:54:59)

git-committer:

Alex Dehnert <adehnert@…> (02/11/14 01:59:28)

Message:

People lookup: Handle more name formats (ASA-#253)

• Split names on commas as well as newlines
• Parse mailman list info pages -- convert "user at domain" to "user@domain" and ignore parentheses around addresses

File:

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

asadb/forms/models.py

@@ -3 +3 @@
 import json
 import os
+import re
 
 import ldap
@@ -298 +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)