<!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>[13259] twext/trunk/twext/who/opendirectory</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/13259">13259</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-04-10 17:38:45 -0700 (Thu, 10 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add test_queryStringFromExpression_recordType test and fix recordType NOT match</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoopendirectory_servicepy">twext/trunk/twext/who/opendirectory/_service.py</a></li>
<li><a href="#twexttrunktwextwhoopendirectorytesttest_servicepy">twext/trunk/twext/who/opendirectory/test/test_service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_service.py (13258 => 13259)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py        2014-04-11 00:24:32 UTC (rev 13258)
+++ twext/trunk/twext/who/opendirectory/_service.py        2014-04-11 00:38:45 UTC (rev 13259)
</span><span class="lines">@@ -279,8 +279,10 @@
</span><span class="cx"> for subExpression in expression.expressions:
</span><span class="cx"> queryToken, subExpRecordTypes = self._queryStringAndRecordTypesFromExpression(subExpression)
</span><span class="cx"> if subExpRecordTypes:
</span><del>- if expression.operand is Operand.AND or queryToken == u"!": # AND or NOR
</del><ins>+ if expression.operand is Operand.AND:
</ins><span class="cx"> recordTypes |= subExpRecordTypes
</span><ins>+ elif queryToken == u"!": #NOR
+ recordTypes |= set([t.value for t in ODRecordType.iterconstants()]) - subExpRecordTypes
</ins><span class="cx"> else:
</span><span class="cx"> raise QueryNotSupportedError(
</span><span class="cx"> "Record type matches must AND or NOR"
</span><span class="lines">@@ -398,9 +400,6 @@
</span><span class="cx">
</span><span class="cx"> flags = tuple(expression.flags)
</span><span class="cx">
</span><del>- if MatchFlags.NOT in flags:
- raise NotImplementedError()
-
</del><span class="cx"> if MatchFlags.caseInsensitive in flags:
</span><span class="cx"> caseInsensitive = 0x100
</span><span class="cx"> else:
</span><span class="lines">@@ -425,11 +424,17 @@
</span><span class="cx"> recordTypes = ODRecordType.fromRecordType(
</span><span class="cx"> expression.fieldValue
</span><span class="cx"> ).value
</span><ins>+ if MatchFlags.NOT in flags:
+ recordTypes = set([t.value for t in ODRecordType.iterconstants()]) - recordTypes
+
</ins><span class="cx"> matchType = ODMatchType.any.value
</span><span class="cx"> queryAttribute = None
</span><span class="cx"> queryValue = None
</span><span class="cx">
</span><span class="cx"> else:
</span><ins>+ if MatchFlags.NOT in flags:
+ raise NotImplementedError()
+
</ins><span class="cx"> if recordType is None:
</span><span class="cx"> recordTypes = [t.value for t in ODRecordType.iterconstants()]
</span><span class="cx"> else:
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectorytesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/test/test_service.py (13258 => 13259)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/test/test_service.py        2014-04-11 00:24:32 UTC (rev 13258)
+++ twext/trunk/twext/who/opendirectory/test/test_service.py        2014-04-11 00:38:45 UTC (rev 13259)
</span><span class="lines">@@ -27,9 +27,9 @@
</span><span class="cx"> )
</span><span class="cx"> from .._constants import ODAttribute
</span><span class="cx"> from .._service import DirectoryService
</span><ins>+from ...idirectory import QueryNotSupportedError
</ins><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> class OpenDirectoryServiceTestCase(unittest.TestCase):
</span><span class="cx"> """
</span><span class="cx"> Tests for L{DirectoryService}.
</span><span class="lines">@@ -225,3 +225,139 @@
</span><span class="cx"> u"(dsAttrTypeStandard:RealName=c))"
</span><span class="cx"> )
</span><span class="cx"> )
</span><ins>+
+
+ def test_queryStringFromExpression_recordType(self):
+ """
+ Record type in expression
+ """
+ service = DirectoryService()
+
+ # AND expression
+ expression = CompoundExpression(
+ [
+ MatchExpression(
+ service.fieldName.shortNames,
+ u"xyzzy",
+ matchType=MatchType.equals
+ ),
+ MatchExpression(
+ service.fieldName.recordType,
+ service.recordType.group,
+ matchType=MatchType.equals
+ ),
+ MatchExpression(
+ service.fieldName.recordType,
+ service.recordType.user,
+ matchType=MatchType.equals
+ ),
+ ],
+ Operand.AND
+ )
+ queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
+ self.assertEquals(set(recordTypes), set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"]))
+ self.assertEquals(
+ queryString,
+ u"(dsAttrTypeStandard:RecordName=xyzzy)"
+ )
+
+ # AND subexpression
+ expression = CompoundExpression(
+ [
+ MatchExpression(
+ service.fieldName.shortNames,
+ u"xyzzy",
+ matchType=MatchType.equals
+ ),
+ CompoundExpression(
+ [
+
+ MatchExpression(
+ service.fieldName.recordType,
+ service.recordType.group,
+ matchType=MatchType.equals
+ ),
+ MatchExpression(
+ service.fieldName.recordType,
+ service.recordType.user,
+ matchType=MatchType.equals
+ ),
+ ],
+ Operand.AND
+ ),
+ ],
+ Operand.AND
+ )
+ queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
+ self.assertEquals(set(recordTypes), set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"]))
+ self.assertEquals(
+ queryString,
+ u"(dsAttrTypeStandard:RecordName=xyzzy)"
+ )
+
+ # NOR expression
+ expression = CompoundExpression(
+ [
+ MatchExpression(
+ service.fieldName.shortNames,
+ u"xxxxx",
+ matchType=MatchType.equals
+ ),
+ MatchExpression(
+ service.fieldName.shortNames,
+ u"yyyyy",
+ matchType=MatchType.equals
+ ),
+ MatchExpression(
+ service.fieldName.recordType,
+ service.recordType.user,
+ matchType=MatchType.equals,
+ flags=MatchFlags.NOT
+ ),
+ ],
+ Operand.OR
+ )
+ queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
+ self.assertEquals(set(recordTypes), set([u"dsRecTypeStandard:Groups"]))
+ self.assertEquals(
+ queryString,
+ u"("
+ u"|(dsAttrTypeStandard:RecordName=xxxxx)"
+ u"(dsAttrTypeStandard:RecordName=yyyyy)"
+ u")"
+ )
+
+ # Simple AND expression -> empty query string
+ expression = CompoundExpression(
+ [
+ MatchExpression(
+ service.fieldName.recordType,
+ service.recordType.user,
+ matchType=MatchType.equals
+ ),
+ ],
+ Operand.AND
+ )
+ queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
+ self.assertEquals(set(recordTypes), set([u"dsRecTypeStandard:Users"]))
+ self.assertEquals(
+ queryString,
+ u""
+ )
+
+ # recordType OR expression raises QueryNotSupportedError
+ expression = CompoundExpression(
+ [
+ MatchExpression(
+ service.fieldName.recordType,
+ service.recordType.user,
+ matchType=MatchType.equals
+ ),
+ ],
+ Operand.OR
+ )
+ self.assertRaises(
+ QueryNotSupportedError,
+ service._queryStringAndRecordTypesFromExpression,
+ expression,
+ )
</ins></span></pre>
</div>
</div>
</body>
</html>