Robustify in face of new affiliation: "Collaboration"

Also map "Collaboration" to the same as "Affiliate" (Staff).

Signed-off-by: Dan Scott <dscott@laurentian.ca>

diff --git a/tools/patron-load/ldap_osrf_sync b/tools/patron-load/ldap_osrf_sync
index ebd1725..1bc53fc 100755 (executable)
--- a/tools/patron-load/ldap_osrf_sync
+++ b/tools/patron-load/ldap_osrf_sync
@@ -187,6 +187,7 @@ class User:
             'proxy': None,
             'retired': None,
             'affiliate': 115,
+            'collaboration': 115,
             'visitor': 113
         }
 
@@ -204,11 +205,14 @@ class User:
                             self.affiliation = 'gr'
                         else:
                             self.affiliation = 'ug'
+                    else:
+                        self.affiliation = affiliation
                 else:
-                    self.affiliation = affiliation
+                    print >> sys.stderr, "Affiliation '%s' not mapped to a profile " \
+                        "for user %s" % (affiliation, self.ldap_atts)
 
         if hasattr(self, 'affiliation'):
-            return profile_map[affiliation]
+            return profile_map[self.affiliation]
 
         if  'empl' in self.cname.lower():
             affiliation = 'staff'