Changeset 1611 for WAeUP_SRP/trunk

Timestamp:

20 Mar 2007, 18:26:23 (18 years ago)

Author:

joachim

Message:

fixAllNames enhanced

File:

• WAeUP_SRP/trunk/Students.py (modified) (2 diffs)

WAeUP_SRP/trunk/Students.py

@@ -762 +762 @@
             if not old_first and not old_middle and old_last:
                 new_names = [n.capitalize() for n in old_last.split()]
-                if len(new_names) > 3:
+                if len(new_names) > 1:
                     old_first = new_names[0]
-                    old_last = new_names[1]
-                    old_middle = ' '.join(new_names[2:])
-                elif len(new_names) == 3:
-                    old_first = new_names[0]
-                    old_last = new_names[1]
-                    old_middle = new_names[2]
-                elif len(new_names) == 2:
-                    old_first = new_names[0]
-                    old_last = new_names[1]
-                    old_middle = ''
-                elif len(new_names) == 1:
+                    old_last = new_names[-1]
+                    old_middle = ' '.join(new_names[1:-1])
+                else:
                     old_last = new_names[0]
                     old_first = ''
                     old_middle = ''
-            if old_last:
-                new_first = old_last
+            if old_first:
+                new_first = old_first
             if old_middle:
                 new_middle = old_middle
-            if old_first:
-                new_last = old_first
-
+            if old_last:
+                new_last = old_last
             if old_first.find('<') != -1 or\
                old_first.find('>') != -1 or\
@@ -793 +784 @@
                    invalid = "invalid characters"
         else:
-            if old_first and old_middle and old_last:
-                new_first = old_first.capitalize()
-                new_middle = old_middle.capitalize()
-                new_last = old_last.capitalize()
-            elif old_first and not old_middle and old_last:
-                new_names = [n.capitalize() for n in old_first.split()]
-                if len(new_names) > 1:
-                    new_first = new_names[0]
-                    new_middle = ' '.join(new_names[1:])
-                else:
-                    new_first = old_first.capitalize()
-                    new_middle = ''
-                new_last = old_last.capitalize()
-            elif not old_first and not old_middle and old_last:
+            new_first = old_first
+            if new_first.strip() == '-':
                 new_first = ''
+            new_middle = old_middle
+            if new_middle.strip() == '-':
                 new_middle = ''
-                new_last = old_last.capitalize()
-            else:
-                new_first = ''
-                new_middle = ''
+            new_last = old_last
+            if new_last.strip() == '-':
                 new_last = ''
-        name = "%(new_last)s %(new_first)s %(new_middle)s" % vars()
+        name = "%(new_first)s %(new_middle)s %(new_last)s" % vars()
         if new_student:
             text = "New"