[CalendarServer-changes] [14124] CalendarServer/branches/release/CalendarServer-5.3-dev/ twistedcaldav

[source_changes at macosforge.org]

Revision: 14124
          http://trac.calendarserver.org//changeset/14124
Author:   sagen at apple.com
Date:     2014-10-30 11:19:05 -0700 (Thu, 30 Oct 2014)
Log Message:
-----------
Fix logging format errors, and ignore empty search tokens

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/ldapdirectory.py
    CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/extensions.py

Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/ldapdirectory.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/ldapdirectory.py	2014-10-30 15:42:58 UTC (rev 14123)
+++ CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/directory/ldapdirectory.py	2014-10-30 18:19:05 UTC (rev 14124)
@@ -315,7 +315,7 @@
 
         # Query the LDAP server
         self.log.debug("Querying ldap for records matching base {base} and "
-            "filter {filter} for attributes {attrs}.", 
+            "filter {filter} for attributes {attrs}.",
             base=ldap.dn.dn2str(base), filter=filterstr, attrs=self.attrlist)
 
         # This takes a while, so if you don't want to have a "long request"
@@ -548,10 +548,10 @@
             except ldap.NO_SUCH_OBJECT:
                 return []
             except ldap.FILTER_ERROR, e:
-                self.log.error("LDAP filter error: %s %s" % (e, filterstr))
+                self.log.error("LDAP filter error: {err} {filter}", err=e, filter=filterstr)
                 return []
             except ldap.INVALID_SYNTAX, e:
-                self.log.error("LDAP invalid syntax: %s %s" % (e, filterstr))
+                self.log.error("LDAP invalid syntax: {err} {filter}", err=e, filter=filterstr)
                 return []
             except ldap.SIZELIMIT_EXCEEDED, e:
                 self.log.debug("LDAP result limit exceeded: %d" % (resultLimit,))

Modified: CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/extensions.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/extensions.py	2014-10-30 15:42:58 UTC (rev 14123)
+++ CalendarServer/branches/release/CalendarServer-5.3-dev/twistedcaldav/extensions.py	2014-10-30 18:19:05 UTC (rev 14124)
@@ -296,8 +296,14 @@
         matchingResources = []
         matchcount = 0
 
-        records = (yield dir.recordsMatchingTokens(tokens, context=context))
+        # Remove empty tokens
+        newTokens = []
+        for token in tokens:
+            if token:
+                newTokens.append(token.strip())
 
+        records = (yield dir.recordsMatchingTokens(newTokens, context=context))
+
         for record in records:
             resource = principalCollection.principalForRecord(record)
             if resource:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20141030/a40a41de/attachment.html>