[CalendarServer-changes] [8941] CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav /directory/xmldirectorybacker.py

[source_changes at macosforge.org]

Revision: 8941
          http://trac.macosforge.org/projects/calendarserver/changeset/8941
Author:   gaya at apple.com
Date:     2012-03-27 16:53:26 -0700 (Tue, 27 Mar 2012)
Log Message:
-----------
fix limit handling

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

Modified: CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py
===================================================================
--- CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py	2012-03-27 20:58:44 UTC (rev 8940)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/xmldirectorybacker.py	2012-03-27 23:53:26 UTC (rev 8941)
@@ -79,7 +79,7 @@
                      "dirRecordAttrToDSAttrMap" : { 
                         "guid" :            dsattributes.kDS1AttrGeneratedUID,
                         "fullName" :        dsattributes.kDS1AttrDistinguishedName,
-                        "shortNames" :      dsattributes.kDSNAttrRecordName,
+                        #"shortNames" :      dsattributes.kDSNAttrRecordName,
                         "firstName" :       dsattributes.kDS1AttrFirstName,
                         "lastName" :        dsattributes.kDS1AttrLastName,
                         "emailAddresses" :  dsattributes.kDSNAttrEMailAddress,
@@ -257,12 +257,15 @@
                     xmlDirectoryRecords = (yield self.listRecords(queryType))
                     self.log_debug("doAddressBookQuery: all #xmlDirectoryRecords %s" % (len(xmlDirectoryRecords), ))
                 
+                #sort so that CalDAVTester can have consistent results when it uses limits
+                xmlDirectoryRecords = sorted(list(xmlDirectoryRecords), key=lambda x:x.guid)
+                
+                """ no good reason to use limit here, let caller do it
                 # apply limit
                 if len(xmlDirectoryRecords) > maxRecords:
-                    #sort so that CalDAVTester can have consistent results when it uses limits
-                    xmlDirectoryRecords = sorted(list(xmlDirectoryRecords), key=lambda x:x.guid)
-                    xmlDirectoryRecords = xmlDirectoryRecords[:maxRecords]
-                self.log_debug("doAddressBookQuery: #xmlDirectoryRecords after max %s" % (len(xmlDirectoryRecords), ))
+                     xmlDirectoryRecords = xmlDirectoryRecords[:maxRecords]
+                     self.log_debug("doAddressBookQuery: #xmlDirectoryRecords after max %s" % (len(xmlDirectoryRecords), ))
+                """
                    
                 for xmlDirectoryRecord in xmlDirectoryRecords:
                     
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120327/c6466703/attachment.html>