<!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>[12253] 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/12253">12253</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-06 19:30:42 -0800 (Mon, 06 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Bring back the native (er, LDAP) compound queries.</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 (12252 => 12253)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py 2014-01-07 03:20:09 UTC (rev 12252)
+++ twext/trunk/twext/who/opendirectory/_service.py 2014-01-07 03:30:42 UTC (rev 12253)
</span><span class="lines">@@ -348,52 +348,51 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- # def _queryFromCompoundExpression(self, expression):
- # """
- # Form an OpenDirectory query from a compound expression.
</del><ins>+ def _queryFromCompoundExpression(self, expression):
+ """
+ Form an OpenDirectory query from a compound expression.
</ins><span class="cx">
</span><del>- # @param expression: The compound expression.
- # @type expression: L{CompoundExpression}
</del><ins>+ @param expression: A compound expression.
+ @type expression: L{CompoundExpression}
</ins><span class="cx">
</span><del>- # @return: A native OpenDirectory query.
- # @rtype: L{ODQuery}
- # """
</del><ins>+ @return: A native OpenDirectory query.
+ @rtype: L{ODQuery}
+ """
</ins><span class="cx">
</span><del>- # queryString = self._queryStringFromExpression(expression)
</del><ins>+ queryString = self._queryStringFromExpression(expression)
</ins><span class="cx">
</span><del>- # recordTypes = [t.value for t in ODRecordType.iterconstants()]
- # attributes = [a.value for a in ODAttribute.iterconstants()]
- # maxResults = 0
</del><ins>+ recordTypes = [t.value for t in ODRecordType.iterconstants()]
+ attributes = [a.value for a in ODAttribute.iterconstants()]
+ maxResults = 0
</ins><span class="cx">
</span><del>- # query, error = ODQuery.queryWithNode_forRecordTypes_attribute_matchType_queryValues_returnAttributes_maximumResults_error_(
- # self.node,
- # recordTypes,
- # None,
- # ODMatchType.compound.value,
- # queryString,
- # attributes,
- # maxResults,
- # None
- # )
</del><ins>+ query, error = ODQuery.queryWithNode_forRecordTypes_attribute_matchType_queryValues_returnAttributes_maximumResults_error_(
+ self.node,
+ recordTypes,
+ None,
+ ODMatchType.compound.value,
+ queryString,
+ attributes,
+ maxResults,
+ None
+ )
</ins><span class="cx">
</span><del>- # if error:
- # self.log.error(
- # "Error while forming OpenDirectory compound query: {error}",
- # error=error
- # )
- # raise OpenDirectoryQueryError(
- # "Unable to form OpenDirectory compound query", error
- # )
</del><ins>+ if error:
+ self.log.error(
+ "Error while forming OpenDirectory compound query: {error}",
+ error=error
+ )
+ raise OpenDirectoryQueryError(
+ "Unable to form OpenDirectory compound query", error
+ )
</ins><span class="cx">
</span><del>- # return query
</del><ins>+ return query
</ins><span class="cx">
</span><span class="cx">
</span><del>-
</del><span class="cx"> def _queryFromMatchExpression(self, expression):
</span><span class="cx"> """
</span><span class="cx"> Form an OpenDirectory query from a match expression.
</span><span class="cx">
</span><del>- @param expression: The match expression.
</del><ins>+ @param expression: A match expression.
</ins><span class="cx"> @type expression: L{MatchExpression}
</span><span class="cx">
</span><span class="cx"> @return: A native OpenDirectory query.
</span><span class="lines">@@ -517,26 +516,15 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- #
- # Commented out because:
- # (a) generating queries as strings is janky; note that quoting is
- # problematic, so queries with characters like ")" don't work.
- # (b) it removes a lot of code.
- #
- # What I'd like to see is a way to nest ODQuery objects, but I can't see
- # any support for that in the OD framework.
- #
- # This seems to also work with the local node. -wsanchez
- #
- # def recordsFromCompoundExpression(self, expression, records=None):
- # try:
- # query = self._queryFromCompoundExpression(expression)
- # return (self._recordsFromQuery(query)
</del><ins>+ def recordsFromCompoundExpression(self, expression, records=None):
+ try:
+ query = self._queryFromCompoundExpression(expression)
+ return self._recordsFromQuery(query)
</ins><span class="cx">
</span><del>- # except QueryNotSupportedError:
- # return BaseDirectoryService.recordsFromCompoundExpression(
- # self, expression
- # )
</del><ins>+ except QueryNotSupportedError:
+ return BaseDirectoryService.recordsFromCompoundExpression(
+ self, expression
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _getUserRecord(self, username):
</span></span></pre>
</div>
</div>
</body>
</html>