<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[12249] CalendarServer/trunk/twistedcaldav/directory</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.calendarserver.org//changeset/12249">12249</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-01-06 18:10:02 -0800 (Mon, 06 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Remove substring duplicates from search tokens</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectoryldapdirectorypy">CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavdirectorytesttest_ldapdirectorypy">CalendarServer/trunk/twistedcaldav/directory/test/test_ldapdirectory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdirectoryldapdirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py (12248 => 12249)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py 2014-01-07 00:59:00 UTC (rev 12248)
+++ CalendarServer/trunk/twistedcaldav/directory/ldapdirectory.py 2014-01-07 02:10:02 UTC (rev 12249)
</span><span class="lines">@@ -1477,9 +1477,25 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> filterStr = None
</span><del>- tokens = [ldapEsc(t) for t in tokens if len(t) > 2]
</del><ins>+
+ # Eliminate any substring duplicates
+ tokenSet = set()
+ for token in tokens:
+ collision = False
+ for existing in tokenSet:
+ if token in existing:
+ collision = True
+ break
+ elif existing in token:
+ tokenSet.remove(existing)
+ break
+ if not collision:
+ tokenSet.add(token)
+
+ tokens = [ldapEsc(t) for t in tokenSet]
</ins><span class="cx"> if len(tokens) == 0:
</span><span class="cx"> return None
</span><ins>+ tokens.sort()
</ins><span class="cx">
</span><span class="cx"> attributes = [
</span><span class="cx"> ("fullName", "(%s=*%s*)"),
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavdirectorytesttest_ldapdirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directory/test/test_ldapdirectory.py (12248 => 12249)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directory/test/test_ldapdirectory.py 2014-01-07 00:59:00 UTC (rev 12248)
+++ CalendarServer/trunk/twistedcaldav/directory/test/test_ldapdirectory.py 2014-01-07 02:10:02 UTC (rev 12249)
</span><span class="lines">@@ -211,6 +211,24 @@
</span><span class="cx"> "extra" : "(a=b)",
</span><span class="cx"> },
</span><span class="cx"> {
</span><ins>+ "tokens" : ["foo", "foo", "oo", "fo", "bar"],
+ "mapping" : {
+ "fullName" : "cn",
+ "emailAddresses" : "mail",
+ },
+ "expected" : "(&(a=b)(|(cn=*bar*)(mail=bar*))(|(cn=*foo*)(mail=foo*)))",
+ "extra" : "(a=b)",
+ },
+ {
+ "tokens" : ["fo", "foo", "foooo", "ooo", "fooo"],
+ "mapping" : {
+ "fullName" : "cn",
+ "emailAddresses" : "mail",
+ },
+ "expected" : "(&(a=b)(|(cn=*foooo*)(mail=foooo*)))",
+ "extra" : "(a=b)",
+ },
+ {
</ins><span class="cx"> "tokens" : ["foo"],
</span><span class="cx"> "mapping" : {
</span><span class="cx"> "fullName" : "cn",
</span><span class="lines">@@ -239,7 +257,7 @@
</span><span class="cx"> "mapping" : {
</span><span class="cx"> "emailAddresses" : "mail",
</span><span class="cx"> },
</span><del>- "expected" : "(&(mail=foo*)(mail=bar*))",
</del><ins>+ "expected" : "(&(mail=bar*)(mail=foo*))",
</ins><span class="cx"> "extra" : None,
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -248,7 +266,7 @@
</span><span class="cx"> "fullName" : "cn",
</span><span class="cx"> "emailAddresses" : "mail",
</span><span class="cx"> },
</span><del>- "expected" : "(&(|(cn=*foo*)(mail=foo*))(|(cn=*bar*)(mail=bar*)))",
</del><ins>+ "expected" : "(&(|(cn=*bar*)(mail=bar*))(|(cn=*foo*)(mail=foo*)))",
</ins><span class="cx"> "extra" : None,
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -257,7 +275,7 @@
</span><span class="cx"> "fullName" : "cn",
</span><span class="cx"> "emailAddresses" : ["mail", "mailAliases"],
</span><span class="cx"> },
</span><del>- "expected" : "(&(|(cn=*foo*)(mail=foo*)(mailAliases=foo*))(|(cn=*bar*)(mail=bar*)(mailAliases=bar*)))",
</del><ins>+ "expected" : "(&(|(cn=*bar*)(mail=bar*)(mailAliases=bar*))(|(cn=*foo*)(mail=foo*)(mailAliases=foo*)))",
</ins><span class="cx"> "extra" : None,
</span><span class="cx"> },
</span><span class="cx"> {
</span><span class="lines">@@ -266,7 +284,7 @@
</span><span class="cx"> "fullName" : "cn",
</span><span class="cx"> "emailAddresses" : "mail",
</span><span class="cx"> },
</span><del>- "expected" : "(&(|(cn=*foo*)(mail=foo*))(|(cn=*bar*)(mail=bar*))(|(cn=*baz\\28*)(mail=baz\\28*)))",
</del><ins>+ "expected" : "(&(|(cn=*bar*)(mail=bar*))(|(cn=*baz\\28*)(mail=baz\\28*))(|(cn=*foo*)(mail=foo*)))",
</ins><span class="cx"> "extra" : None,
</span><span class="cx"> },
</span><span class="cx"> ]
</span></span></pre>
</div>
</div>
</body>
</html>