[CalendarServer-changes] [8974] CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav /directory

[source_changes at macosforge.org]

Revision: 8974
          http://trac.macosforge.org/projects/calendarserver/changeset/8974
Author:   gaya at apple.com
Date:     2012-04-03 14:41:37 -0700 (Tue, 03 Apr 2012)
Log Message:
-----------
Clean up unused, fix XMPP -> IMPP typo in vCard property to ds attribute mapping

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

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py	2012-04-03 21:31:10 UTC (rev 8973)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py	2012-04-03 21:41:37 UTC (rev 8974)
@@ -145,14 +145,6 @@
  
         super(LdapDirectoryBackingService, self).__init__(params)
         
-         ### self.defaultNodeName used by ABDirectoryQueryResult.
-        # get this now once
-        hostname = getfqdn()
-        if hostname:
-            self.defaultNodeName = "/LDAPv3/" + hostname
-        else:
-            self.defaultNodeName = None
-        
  
     def __hash__(self):
         h = hash(self.__class__.__name__)
@@ -285,7 +277,7 @@
                                         self.log_debug("doAddressBookQuery: dsRecordAttributes[%s] = %s" % (dsAttributeName, dsRecordAttributes[dsAttributeName],))
  
                         # get a record for dsRecordAttributes 
-                        result = ABDirectoryQueryResult(self.directoryBackedAddressBook, dsRecordAttributes, defaultNodeName=None, generateSimpleUIDs=self.generateSimpleUIDs, appleInternalServer=self.appleInternalServer)
+                        result = ABDirectoryQueryResult(self.directoryBackedAddressBook, dsRecordAttributes, generateSimpleUIDs=self.generateSimpleUIDs, appleInternalServer=self.appleInternalServer)
                     except:
                         traceback.print_exc()
                         self.log_info("Could not get vcard for %s" % (dn,))

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-04-03 21:31:10 UTC (rev 8973)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/opendirectorybacker.py	2012-04-03 21:41:37 UTC (rev 8974)
@@ -176,17 +176,9 @@
             
         
         
-        self._dsLocalRecords = []
+        self._dsLocalResults = {}
         self._nextDSLocalQueryTime = 0
         
-        # get this now once
-        hostname = getfqdn()
-        if hostname:
-            self.defaultNodeName = "/LDAPv3/" + hostname
-        else:
-            self.defaultNodeName = None
-        
-
     def __cmp__(self, other):
         if not isinstance(other, DirectoryRecord):
             return super(DirectoryRecord, self).__eq__(other)
@@ -229,11 +221,10 @@
                 self.log_error("Open Directory (node=%s) error: %s" % ("/Local/Default", str(ex)))
                 raise
             
-            self._dsLocalRecords = []        
             for (recordShortName, value) in records: #@UnusedVariable
                 
                 try:
-                    result = ABDirectoryQueryResult(self.directoryBackedAddressBook, value, defaultNodeName="/Local/Default")
+                    result = ABDirectoryQueryResult(self.directoryBackedAddressBook, value)
                 except:
                     traceback.print_exc()
                     self.log_info("Could not get vcard for record %s" % (recordShortName,))
@@ -262,11 +253,11 @@
             return {}
         
         if time.time() > self._nextDSLocalQueryTime:
-            self._dsLocalRecords = generateDSLocalResults()
+            self._dsLocalResults = generateDSLocalResults()
             # Add jitter/fuzz factor 
             self._nextDSLocalQueryTime = time.time() + self.dsLocalCacheTimeout * (random() + 0.5)  * 60
 
-        return self._dsLocalRecords
+        return self._dsLocalResults
     
 
     @inlineCallbacks
@@ -290,7 +281,6 @@
             
             try:
                 result = ABDirectoryQueryResult(self.directoryBackedAddressBook, value, 
-                                     defaultNodeName=self.defaultNodeName, 
                                      generateSimpleUIDs=self.generateSimpleUIDs, 
                                      addDSAttrXProperties=self.addDSAttrXProperties,
                                      appleInternalServer=self.appleInternalServer,
@@ -935,7 +925,7 @@
                 (dsattributes.kDS1AttrUserPKCS12Data, "base64"),
                 (dsattributes.kDS1AttrUserSMIMECertificate, "base64"),
                 ],
-         "XMPP" : [
+         "IMPP" : [
                 dsattributes.kDSNAttrIMHandle,
                 ],
          "X-AIM" : [
@@ -1007,7 +997,7 @@
         }
 
     
-    def __init__(self, directoryBackedAddressBook, recordAttributes, defaultNodeName=None, generateSimpleUIDs=False, addDSAttrXProperties=False, appleInternalServer=False, ):
+    def __init__(self, directoryBackedAddressBook, recordAttributes, generateSimpleUIDs=False, addDSAttrXProperties=False, appleInternalServer=False, ):
         
 
         self.log_debug("directoryBackedAddressBook=%s, attributes=%s"    % (directoryBackedAddressBook, recordAttributes))
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120403/353bfd01/attachment.html>