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

source_changes at macosforge.org source_changes at macosforge.org
Mon Apr 9 16:27:13 PDT 2012


Revision: 8999
          http://trac.macosforge.org/projects/calendarserver/changeset/8999
Author:   gaya at apple.com
Date:     2012-04-09 16:27:13 -0700 (Mon, 09 Apr 2012)
Log Message:
-----------
fix query limit

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-04-09 23:04:40 UTC (rev 8998)
+++ CalendarServer/branches/users/gaya/ldapdirectorybacker/twistedcaldav/directory/ldapdirectorybacker.py	2012-04-09 23:27:13 UTC (rev 8999)
@@ -302,11 +302,10 @@
                     queryStr = queryFilter
                 elif dsFilter:
                     queryStr = dsFilter.generate()
-                    
+
                 
-                
                 # keep trying ldap query till we get results based on filter.  Especially when doing "all results" query
-                remainingMaxResults = maxResults - len(results)
+                remainingMaxResults = maxResults - len(results) if maxResults else 0
                 maxLdapResults = int(remainingMaxResults * 1.2)
     
                 while True:
@@ -342,6 +341,8 @@
                         maxLdapResults = self.maxQueryResults
                     
                 results += filteredResults
+                if maxResults and len(results) > maxResults:
+                    break
                 
         
         limited = maxResults and len(results) >= maxResults
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120409/922413fd/attachment.html>


More information about the calendarserver-changes mailing list