<!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>[13169] twext/trunk/twext/who/opendirectory/_service.py</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/13169">13169</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-04-04 15:59:48 -0700 (Fri, 04 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>in _queryFromCompoundExpression() handle AND recordType match expressions</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoopendirectory_servicepy">twext/trunk/twext/who/opendirectory/_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 (13168 => 13169)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py 2014-04-04 20:43:24 UTC (rev 13168)
+++ twext/trunk/twext/who/opendirectory/_service.py 2014-04-04 22:59:48 UTC (rev 13169)
</span><span class="lines">@@ -210,15 +210,15 @@
</span><span class="cx"> self._node = node
</span><span class="cx">
</span><span class="cx">
</span><del>- def _queryStringFromMatchExpression(self, expression):
</del><ins>+ def _queryStringAndRecordTypesFromMatchExpression(self, expression):
</ins><span class="cx"> """
</span><span class="cx"> Generates an LDAP query string from a match expression.
</span><span class="cx">
</span><span class="cx"> @param expression: A match expression.
</span><span class="cx"> @type expression: L{MatchExpression}
</span><span class="cx">
</span><del>- @return: An LDAP query string.
- @rtype: C{unicode}
</del><ins>+ @return: tuple(LDAP query string, recordTypes)
+ @rtype: (C{unicode}, set())
</ins><span class="cx"> """
</span><span class="cx"> matchType = ODMatchType.fromMatchType(expression.matchType)
</span><span class="cx"> if matchType is None:
</span><span class="lines">@@ -236,15 +236,13 @@
</span><span class="cx"> # if MatchFlags.caseInsensitive not in flags:
</span><span class="cx"> # raise NotImplementedError("Need to handle case sensitive")
</span><span class="cx">
</span><ins>+ if expression.fieldName is self.fieldName.recordType:
+ return (notOp, set([ODRecordType.fromRecordType(expression.fieldValue).value]),)
+
</ins><span class="cx"> if expression.fieldName is self.fieldName.uid:
</span><span class="cx"> odAttr = ODAttribute.guid
</span><span class="cx"> value = expression.fieldValue
</span><span class="cx">
</span><del>- elif expression.fieldName is self.fieldName.recordType:
- raise QueryNotSupportedError(
- "Can't build a query string for record types."
- )
-
</del><span class="cx"> else:
</span><span class="cx"> odAttr = ODAttribute.fromFieldName(expression.fieldName)
</span><span class="cx"> if odAttr is None:
</span><span class="lines">@@ -257,43 +255,54 @@
</span><span class="cx"> value = unicode(value) # We want unicode
</span><span class="cx"> value = value.translate(LDAP_QUOTING_TABLE) # Escape special chars
</span><span class="cx">
</span><del>- return matchType.queryString.format(
- notOp=notOp, attribute=odAttr.value, value=value
</del><ins>+ return (
+ matchType.queryString.format(
+ notOp=notOp, attribute=odAttr.value, value=value
+ ),
+ None,
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- def _queryStringFromCompoundExpression(self, expression):
</del><ins>+ def _queryStringAndRecordTypesFromCompoundExpression(self, expression):
</ins><span class="cx"> """
</span><span class="cx"> Generates an LDAP query string from a compound expression.
</span><span class="cx">
</span><span class="cx"> @param expression: A compound expression.
</span><span class="cx"> @type expression: L{MatchExpression}
</span><span class="cx">
</span><del>- @return: An LDAP query string.
- @rtype: C{unicode}
</del><ins>+ @return: tuple(LDAP query string, recordTypes)
+ @rtype: (C{unicode}, set())
</ins><span class="cx"> """
</span><span class="cx"> queryTokens = []
</span><ins>+ recordTypes = set()
</ins><span class="cx">
</span><del>- if len(expression.expressions) > 1:
- queryTokens.append(u"(")
-
- if expression.operand is Operand.AND:
- queryTokens.append(u"&")
</del><ins>+ for subExpression in expression.expressions:
+ queryToken, subExpRecordTypes = self._queryStringAndRecordTypesFromExpression(subExpression)
+ if subExpRecordTypes:
+ if expression.operand is Operand.AND or queryToken == u"!": # AND or NOR
+ recordTypes |= subExpRecordTypes
+ else:
+ raise QueryNotSupportedError(
+ "Record type matches must AND or NOR"
+ )
</ins><span class="cx"> else:
</span><del>- queryTokens.append(u"|")
</del><ins>+ queryTokens.append(queryToken)
</ins><span class="cx">
</span><del>- for subExpression in expression.expressions:
- queryTokens.append(
- self._queryStringFromExpression(subExpression)
- )
</del><ins>+ if queryTokens:
+ if len(queryTokens) > 1:
+ if expression.operand is Operand.AND:
+ queryTokens[:0] = (u"&")
+ else:
+ queryTokens[:0] = (u"|")
</ins><span class="cx">
</span><del>- if len(expression.expressions) > 1:
- queryTokens.append(u")")
</del><ins>+ if len(queryTokens) > 2:
+ queryTokens[:0] = (u"(")
+ queryTokens.append(u")")
</ins><span class="cx">
</span><del>- return u"".join(queryTokens)
</del><ins>+ return (u"".join(queryTokens), recordTypes if recordTypes else None,)
</ins><span class="cx">
</span><span class="cx">
</span><del>- def _queryStringFromExpression(self, expression):
</del><ins>+ def _queryStringAndRecordTypesFromExpression(self, expression):
</ins><span class="cx"> """
</span><span class="cx"> Converts either a MatchExpression or a CompoundExpression into an LDAP
</span><span class="cx"> query string.
</span><span class="lines">@@ -301,15 +310,15 @@
</span><span class="cx"> @param expression: An expression.
</span><span class="cx"> @type expression: L{MatchExpression} or L{CompoundExpression}
</span><span class="cx">
</span><del>- @return: A native OpenDirectory query string
- @rtype: C{unicode}
</del><ins>+ @return: tuple(LDAP query string, recordTypes)
+ @rtype: (C{unicode}, set())
</ins><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> if isinstance(expression, MatchExpression):
</span><del>- return self._queryStringFromMatchExpression(expression)
</del><ins>+ return self._queryStringAndRecordTypesFromMatchExpression(expression)
</ins><span class="cx">
</span><span class="cx"> if isinstance(expression, CompoundExpression):
</span><del>- return self._queryStringFromCompoundExpression(expression)
</del><ins>+ return self._queryStringAndRecordTypesFromCompoundExpression(expression)
</ins><span class="cx">
</span><span class="cx"> raise QueryNotSupportedError(
</span><span class="cx"> "Unknown expression type: {0!r}".format(expression)
</span><span class="lines">@@ -327,9 +336,17 @@
</span><span class="cx"> @rtype: L{ODQuery}
</span><span class="cx"> """
</span><span class="cx">
</span><del>- queryString = self._queryStringFromExpression(expression)
</del><ins>+ queryString, recordTypes = self._queryStringAndRecordTypesFromExpression(expression)
+ supportedRecordTypes = set([t.value for t in ODRecordType.iterconstants()])
+ if recordTypes:
+ recordTypes = supportedRecordTypes & recordTypes
+ if not recordTypes:
+ raise QueryNotSupportedError(
+ "Query for unsupported record types: {0!r}".format(recordTypes - supportedRecordTypes)
+ )
+ else:
+ recordTypes = supportedRecordTypes
</ins><span class="cx">
</span><del>- recordTypes = [t.value for t in ODRecordType.iterconstants()]
</del><span class="cx"> attributes = [a.value for a in ODAttribute.iterconstants()]
</span><span class="cx"> maxResults = 0
</span><span class="cx">
</span><span class="lines">@@ -337,8 +354,8 @@
</span><span class="cx"> self.node,
</span><span class="cx"> recordTypes,
</span><span class="cx"> None,
</span><del>- ODMatchType.compound.value,
- queryString,
</del><ins>+ ODMatchType.compound.value if queryString else ODMatchType.any.value,
+ queryString if queryString else None,
</ins><span class="cx"> attributes,
</span><span class="cx"> maxResults,
</span><span class="cx"> None
</span><span class="lines">@@ -422,7 +439,7 @@
</span><span class="cx"> expression.fieldName
</span><span class="cx"> ).value
</span><span class="cx">
</span><del>- # TODO: Add support other valuetypes:
</del><ins>+ # TODO: Add support other value types:
</ins><span class="cx"> valueType = self.fieldName.valueType(expression.fieldName)
</span><span class="cx"> if valueType == UUID:
</span><span class="cx"> queryValue = unicode(expression.fieldValue).upper()
</span></span></pre>
</div>
</div>
</body>
</html>