<!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>[12161] twext/trunk/twext/who/directory.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/12161">12161</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-19 18:06:01 -0800 (Thu, 19 Dec 2013)</dd>
</dl>

<h3>Log Message</h3>
<pre>Add self.recordsFromCompoundExpression()</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhodirectorypy">twext/trunk/twext/who/directory.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhodirectorypy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/directory.py (12160 => 12161)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/directory.py        2013-12-20 02:05:41 UTC (rev 12160)
+++ twext/trunk/twext/who/directory.py        2013-12-20 02:06:01 UTC (rev 12161)
</span><span class="lines">@@ -116,7 +116,7 @@
</span><span class="cx"> 
</span><span class="cx">     def recordsFromNonCompoundExpression(self, expression, records=None):
</span><span class="cx">         &quot;&quot;&quot;
</span><del>-        Finds records matching a expression.
</del><ins>+        Finds records matching a non-compound expression.
</ins><span class="cx"> 
</span><span class="cx">         @note: This method is called by L{recordsFromExpression} to handle
</span><span class="cx">             all expressions other than L{CompoundExpression}.
</span><span class="lines">@@ -157,45 +157,67 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><del>-    def recordsFromExpression(self, expression):
-        if isinstance(expression, CompoundExpression):
-            operand = expression.operand
-            subExpressions = iter(expression.expressions)
</del><ins>+    def recordsFromCompoundExpression(self, expression):
+        &quot;&quot;&quot;
+        Finds records matching a compound expression.
</ins><span class="cx"> 
</span><del>-            try:
-                subExpression = subExpressions.next()
-            except StopIteration:
-                returnValue(())
</del><ins>+        @note: This method is called by L{recordsFromExpression} to handle
+            all L{CompoundExpression}s.
</ins><span class="cx"> 
</span><del>-            results = set((
-                yield self.recordsFromNonCompoundExpression(subExpression)
</del><ins>+        @param expression: an expression to apply
+        @type expression: L{CompoundExpression}
+
+        @return: The matching records.
+        @rtype: deferred iterable of L{IDirectoryRecord}s
+
+        @raises: L{QueryNotSupportedError} if the expression is not
+            supported by this directory service.
+        &quot;&quot;&quot;
+        operand = expression.operand
+        subExpressions = iter(expression.expressions)
+
+        try:
+            subExpression = subExpressions.next()
+        except StopIteration:
+            returnValue(())
+
+        results = set((
+            yield self.recordsFromNonCompoundExpression(subExpression)
+        ))
+
+        for subExpression in subExpressions:
+            if operand == Operand.AND:
+                if not results:
+                    # No need to bother continuing here
+                    returnValue(())
+
+                records = results
+            else:
+                records = None
+
+            recordsMatchingExpression = frozenset((
+                yield self.recordsFromNonCompoundExpression(
+                    subExpression,
+                    records=records
+                )
</ins><span class="cx">             ))
</span><span class="cx"> 
</span><del>-            for subExpression in subExpressions:
-                if operand == Operand.AND:
-                    if not results:
-                        # No need to bother continuing here
-                        returnValue(())
</del><ins>+            if operand == Operand.AND:
+                results &amp;= recordsMatchingExpression
+            elif operand == Operand.OR:
+                results |= recordsMatchingExpression
+            else:
+                raise QueryNotSupportedError(
+                    &quot;Unknown operand: {0}&quot;.format(operand)
+                )
</ins><span class="cx"> 
</span><del>-                    records = results
-                else:
-                    records = None
</del><ins>+        returnValue(results)
</ins><span class="cx"> 
</span><del>-                recordsMatchingExpression = frozenset((
-                    yield self.recordsFromNonCompoundExpression(
-                        subExpression,
-                        records=records
-                    )
-                ))
</del><span class="cx"> 
</span><del>-                if operand == Operand.AND:
-                    results &amp;= recordsMatchingExpression
-                elif operand == Operand.OR:
-                    results |= recordsMatchingExpression
-                else:
-                    raise QueryNotSupportedError(
-                        &quot;Unknown operand: {0}&quot;.format(operand)
-                    )
</del><ins>+    @inlineCallbacks
+    def recordsFromExpression(self, expression):
+        if isinstance(expression, CompoundExpression):
+            results = yield self.recordsFromCompoundExpression(expression)
</ins><span class="cx">         else:
</span><span class="cx">             results = yield self.recordsFromNonCompoundExpression(expression)
</span><span class="cx"> 
</span></span></pre>
</div>
</div>

</body>
</html>