[CalendarServer-changes] [8894] CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav /directory/ldapdirectorybacker.py
source_changes at macosforge.org
source_changes at macosforge.org
Fri Mar 16 11:34:32 PDT 2012
Revision: 8894
http://trac.macosforge.org/projects/calendarserver/changeset/8894
Author: gaya at apple.com
Date: 2012-03-16 11:34:32 -0700 (Fri, 16 Mar 2012)
Log Message:
-----------
cleaning
Modified Paths:
--------------
CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py
Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py 2012-03-16 18:13:08 UTC (rev 8893)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py 2012-03-16 18:34:32 UTC (rev 8894)
@@ -20,7 +20,7 @@
"""
__all__ = [
- "LdapDirectoryBackingService", "VCardRecord",
+ "LdapDirectoryBackingService",
]
import traceback
@@ -45,10 +45,9 @@
class LdapDirectoryBackingService(LdapDirectoryService):
"""
"""
-
- baseGUID = "BF07A1A2-5BB5-4A4D-A59A-67260EA7E143"
- node="/Search"
+ node="/Search"
+
def __repr__(self):
return "<%s %r>" % (self.__class__.__name__, self.realmName, )
@@ -73,10 +72,10 @@
},
},
},
- "appleInternalServer":False, # does magic in VCardRecord
- "maxQueryRecords":0, # max records returned
- "fakeETag":True, # eTag is fake, otherwise it is md5(all attributes)
- "generateSimpleUIDs":False, # if UID is faked, use simple method for generating
+ "appleInternalServer":False, # does magic in VCardRecord
+ "maxQueryRecords":0, # max records returned
+ "fakeETag":True, # eTag is fake, otherwise it is md5(all attributes)
+ "generateSimpleUIDs":False, # if UID is faked, use simple method for generating
}
#params = self.getParams(params, defaults, ignored)
@@ -137,7 +136,7 @@
self.realmName = None # needed for super
- ### used by VCardRecord.
+ ### params for VCardRecord()
self.fakeETag = fakeETag
self.generateSimpleUIDs = generateSimpleUIDs
self.appleInternalServer = appleInternalServer
@@ -227,9 +226,8 @@
if allRecords:
dsFilter = None # None expression == all Records
- # could stop query for all, but OK because of post filtering.
- # clear = not allRecords and not dsFilter
- clear = False
+ # stop query all
+ clear = not allRecords and not dsFilter
if not clear:
queryAttributes = self._ldapAttributesForAddressBookQuery( addressBookQuery, ldapAttrToDSAttrMap )
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120316/71816ed8/attachment-0001.html>
More information about the calendarserver-changes
mailing list