Added list-handling to AttributeHolder.__unicode__

Also added some missing fields from the Drexel specs to the
AttributeHolder subclasses.

diff --git a/sitecore/prof/__init__.py b/sitecore/prof/__init__.py
index d8c66624f163ba06b2172083ab39bb3a7e5eec97..c78899df2be4bab7b6929e42ed4c51c1ab5e6f59 100644 (file)
--- a/sitecore/prof/__init__.py
+++ b/sitecore/prof/__init__.py
@@ -71,7 +71,7 @@ class AttributeHolder (object):
         return self.__unicode__()
 
     def __repr__(self):
-        return self.__unicode__()
+        return '<%s>' % self.__unicode__().replace('\n',';')
 
     def __unicode__(self):
         lines = ['%s:' % self.__class__.__name__]
@@ -79,14 +79,20 @@ class AttributeHolder (object):
             value = getattr(self, field)
             if value == None:
                 continue
-            value_lines = unicode(value).splitlines()
-            if isinstance(value, AttributeHolder):
-                prefix = '  '
+            if isinstance(value, (tuple, list)):
+                for v in value:
+                    lines.extend(self._format_value(field, v))
             else:
-                prefix = '  %s: ' % field
-            lines.extend(['%s%s' % (prefix, L) for L in value_lines])
+                lines.extend(self._format_value(field, value))
         return u'\n'.join(lines)
 
+    def _format_value(self, field, value):
+        value_lines = unicode(value).splitlines()
+        if isinstance(value, AttributeHolder):
+            prefix = '  '
+        else:
+            prefix = '  %s: ' % field
+        return ['%s%s' % (prefix, L) for L in value_lines]
 
 class Name (AttributeHolder):
     fields = ['first_middle', 'last']
@@ -95,10 +101,12 @@ class Graduation (AttributeHolder):
     fields = ['college', 'title', 'year']
 
 class Contact (AttributeHolder):
-    fields = ['office', 'website', 'phone', 'lab', 'lab_phone']
+    fields = ['office', 'email', 'website', 'phone', 'lab', 'lab_phone']
 
 class Bio (AttributeHolder):
     fields = ['specialization', 'publications', 'profile', 'cv']
 
 class Professor (AttributeHolder):
-    fields = ['name', 'graduations', 'contact', 'bio']
+    fields = ['name', 'title', 'graduations', 'contact', 'bio']
+
+#  LocalWords:  SiteCorePy