<!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>[13582] CalendarServer/trunk/txdav</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/13582">13582</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-05-30 17:39:56 -0700 (Fri, 30 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add 'context' support to recordsMatchingTokens()</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktxdavdpstesttest_clientpy">CalendarServer/trunk/txdav/dps/test/test_client.py</a></li>
<li><a href="#CalendarServertrunktxdavwhodirectorypy">CalendarServer/trunk/txdav/who/directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktxdavdpstesttest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/dps/test/test_client.py (13581 => 13582)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/dps/test/test_client.py 2014-05-31 00:14:35 UTC (rev 13581)
+++ CalendarServer/trunk/txdav/dps/test/test_client.py 2014-05-31 00:39:56 UTC (rev 13582)
</span><span class="lines">@@ -398,6 +398,75 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><ins>+ def test_recordsMatchingTokensWithContext(self):
+
+ testData = [
+ # (
+ # tokens,
+ # context,
+ # short names expected to be in results,
+ # short names not expected to be in results
+ # ),
+ (
+ [u"an"],
+ "user", # just users
+ (u"dre", u"wsanchez"),
+ (u"transporter", u"managers"),
+ ),
+ (
+ [u"an"],
+ "group", # just groups
+ (u"managers",),
+ (u"dre", u"wsanchez", u"transporter"),
+ ),
+ (
+ [u"an"],
+ "location", # just locations
+ (u"sanchezoffice",),
+ (u"dre", u"wsanchez", u"transporter", u"managers"),
+ ),
+ (
+ [u"an"],
+ "resource", # just resources
+ (u"transporter", u"ftlcpu"),
+ (u"dre", u"wsanchez", u"managers", u"sanchezoffice"),
+ ),
+ (
+ [u"an"],
+ "attendee", # just users, groups, resources
+ (
+ u"dre", u"wsanchez", u"managers",
+ u"transporter", u"ftlcpu"
+ ),
+ (u"sanchezoffice",),
+ ),
+ (
+ [u"an"],
+ None, # any type
+ (
+ u"dre", u"wsanchez", u"managers", u"sanchezoffice",
+ u"transporter", u"ftlcpu"
+ ),
+ (),
+ ),
+ ]
+
+ for tokens, context, expected, unexpected in testData:
+ # print("Tokens", tokens, "context", context)
+ records = yield self.directory.recordsMatchingTokens(
+ tokens, context
+ )
+ matchingShortNames = set()
+ for r in records:
+ for shortName in r.shortNames:
+ matchingShortNames.add(shortName)
+ for name in expected:
+ self.assertTrue(name in matchingShortNames)
+ for name in unexpected:
+ self.assertFalse(name in matchingShortNames)
+
+
+ @inlineCallbacks
</ins><span class="cx"> def test_recordsMatchingFields_anyType(self):
</span><span class="cx"> fields = (
</span><span class="cx"> (u"fullNames", "anche", MatchFlags.caseInsensitive, MatchType.contains),
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/directory.py (13581 => 13582)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/directory.py 2014-05-31 00:14:35 UTC (rev 13581)
+++ CalendarServer/trunk/txdav/who/directory.py 2014-05-31 00:39:56 UTC (rev 13582)
</span><span class="lines">@@ -108,13 +108,48 @@
</span><span class="cx">
</span><span class="cx"> returnValue(None)
</span><span class="cx">
</span><ins>+ searchContext_location = "location"
+ searchContext_resource = "resource"
+ searchContext_user = "user"
+ searchContext_group = "group"
+ searchContext_attendee = "attendee"
</ins><span class="cx">
</span><ins>+
+ def recordTypesForSearchContext(self, context):
+ """
+ Map calendarserver-principal-search REPORT context value to applicable record types
+
+ @param context: The context value to map
+ @type context: C{unicode}
+ @returns: The list of record types the context maps to
+ @rtype: C{list} of C{NamedConstant}
+ """
+ if context == "location":
+ recordTypes = [self.recordType.location]
+ elif context == "resource":
+ recordTypes = [self.recordType.resource]
+ elif context == "user":
+ recordTypes = [self.recordType.user]
+ elif context == "group":
+ recordTypes = [self.recordType.group]
+ elif context == "attendee":
+ recordTypes = [
+ self.recordType.user,
+ self.recordType.group,
+ self.recordType.resource
+ ]
+ else:
+ recordTypes = list(self.recordTypes())
+ return recordTypes
+
+
</ins><span class="cx"> def recordsMatchingTokens(self, tokens, context=None, limitResults=50,
</span><span class="cx"> timeoutSeconds=10):
</span><span class="cx"> fields = [
</span><span class="cx"> ("fullNames", MatchType.contains),
</span><span class="cx"> ("emailAddresses", MatchType.startsWith),
</span><span class="cx"> ]
</span><ins>+
</ins><span class="cx"> outer = []
</span><span class="cx"> for token in tokens:
</span><span class="cx"> inner = []
</span><span class="lines">@@ -139,6 +174,36 @@
</span><span class="cx"> else:
</span><span class="cx"> expression = CompoundExpression(outer, Operand.AND)
</span><span class="cx">
</span><ins>+ if context is not None:
+ recordTypes = self.recordTypesForSearchContext(context)
+ log.debug("Context {c}, recordTypes {r}", c=context, r=recordTypes)
+ typeSpecific = []
+ for recordType in recordTypes:
+ typeSpecific.append(
+ MatchExpression(
+ self.fieldName.recordType,
+ recordType,
+ MatchType.equals,
+ MatchFlags.none
+ )
+ )
+
+ if len(typeSpecific) == 1:
+ typeSpecific = typeSpecific[0]
+
+ else:
+ typeSpecific = CompoundExpression(
+ typeSpecific,
+ Operand.OR
+ )
+
+ expression = CompoundExpression(
+ [expression, typeSpecific],
+ Operand.AND
+ )
+
+ log.debug("Expression {e}", e=expression)
+
</ins><span class="cx"> return self.recordsFromExpression(expression)
</span><span class="cx">
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>