[CalendarServer-changes] [8981] CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav /directory/opendirectorybacker.py

[source_changes at macosforge.org]

Revision: 8981
          http://trac.macosforge.org/projects/calendarserver/changeset/8981
Author:   gaya at apple.com
Date:     2012-04-04 15:14:54 -0700 (Wed, 04 Apr 2012)
Log Message:
-----------
move od-only "99" check out of ABDirectoryQueryResult()

Modified Paths:
--------------
    CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-04-04 22:11:08 UTC (rev 8980)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-04-04 22:14:54 UTC (rev 8981)
@@ -230,7 +230,7 @@
                     self.log_info("Could not get vcard for record %s" % (recordShortName,))
                     
                 else:
-                    uid = result.vCard().getProperty("UID").value()
+                    uid = result.vCard().propertyValue("UID")
 
                     if self.ignoreSystemRecords:
                         # remove system users and people
@@ -277,10 +277,14 @@
         resultsDictionary = self._getAllDSLocalResults().copy()
         self.log_debug("Adding %s DSLocal results" % len(resultsDictionary.keys()))
         
-        for (recordShortName, value) in records: #@UnusedVariable
+        for (recordShortName, recordAttributes) in records: #@UnusedVariable
             
             try:
-                result = ABDirectoryQueryResult(self.directoryBackedAddressBook, value, 
+                # fix ds strangeness
+                if recordAttributes.get(dsattributes.kDS1AttrLastName, "") == "99":
+                    del recordAttributes[dsattributes.kDS1AttrLastName]
+        
+                result = ABDirectoryQueryResult(self.directoryBackedAddressBook, recordAttributes, 
                                      generateSimpleUIDs=self.generateSimpleUIDs, 
                                      addDSAttrXProperties=self.addDSAttrXProperties,
                                      appleInternalServer=self.appleInternalServer,
@@ -290,7 +294,7 @@
                 self.log_info("Could not get vcard for record %s" % (recordShortName,))
                 
             else:
-                uid = result.vCard().getProperty("UID").value()
+                uid = result.vCard().propertyValue("UID")
 
                 if self.ignoreSystemRecords:
                     # remove system users and people
@@ -1027,9 +1031,6 @@
             else:
                 self.attributes[key] = values
                 
-        if self.firstValueForAttribute(dsattributes.kDS1AttrLastName) == "99":
-            del self.attributes[dsattributes.kDS1AttrLastName]
-        
         # find a GUID
         guid = self.firstValueForAttribute(dsattributes.kDS1AttrGeneratedUID)
         if not guid:
@@ -1053,8 +1054,8 @@
     def __repr__(self):
         return "<%s[%s(%s)]>" % (
             self.__class__.__name__,
-            self.vCard().getProperty("FN").value(),
-            self.vCard().getProperty("UID").value()
+            self.vCard().propertyValue("FN"),
+            self.vCard().propertyValue("UID")
         )
     
     def __hash__(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120404/baab437a/attachment-0001.html>