<!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>[13289] 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/13289">13289</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-04-15 15:06:05 -0700 (Tue, 15 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Revert to <a href="http://trac.calendarserver.org//changeset/13280">r13280</a> because NO TESTS grr</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 (13288 => 13289)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py        2014-04-15 21:50:44 UTC (rev 13288)
+++ twext/trunk/twext/who/opendirectory/_service.py        2014-04-15 22:06:05 UTC (rev 13289)
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx">             self._node = node
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def _queryStringFromMatchExpression(self, expression):
</del><ins>+    def _queryStringAndRecordTypeFromMatchExpression(self, expression):
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Generates an OD query string from a match expression.
</span><span class="cx"> 
</span><span class="lines">@@ -235,12 +235,10 @@
</span><span class="cx">             notOp = u&quot;&quot;
</span><span class="cx"> 
</span><span class="cx">         # if MatchFlags.caseInsensitive not in flags:
</span><del>-        #     raise QueryNotSupportedError(
-        #         &quot;Case sensitive searches are not supported by LDAP&quot;
-        #     )
</del><ins>+        #     raise NotImplementedError(&quot;Need to handle case sensitive&quot;)
</ins><span class="cx"> 
</span><span class="cx">         if expression.fieldName is self.fieldName.recordType:
</span><del>-            return (notOp, ODRecordType.fromRecordType(expression.fieldValue))
</del><ins>+            return (notOp, ODRecordType.fromRecordType(expression.fieldValue).value)
</ins><span class="cx"> 
</span><span class="cx">         if expression.fieldName is self.fieldName.uid:
</span><span class="cx">             odAttr = ODAttribute.guid
</span><span class="lines">@@ -266,7 +264,7 @@
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def _queryStringFromCompoundExpression(self, expression, recordTypes):
</del><ins>+    def _queryStringAndRecordTypesFromCompoundExpression(self, expression, recordTypes):
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Generates an OD query string from a compound expression.
</span><span class="cx"> 
</span><span class="lines">@@ -280,11 +278,11 @@
</span><span class="cx">         @rtype: (C{unicode}, set(C{unicode}))
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         if recordTypes is None:
</span><del>-            recordTypes = set(ODRecordType.iterconstants())
</del><ins>+            recordTypes = set([t.value for t in ODRecordType.iterconstants()])
</ins><span class="cx"> 
</span><span class="cx">         queryTokens = []
</span><span class="cx">         for subExpression in expression.expressions:
</span><del>-            queryToken, subExpRecordTypes = self._queryStringFromExpression(
</del><ins>+            queryToken, subExpRecordTypes = self._queryStringAndRecordTypesFromExpression(
</ins><span class="cx">                 subExpression, recordTypes
</span><span class="cx">             )
</span><span class="cx">             if subExpRecordTypes:
</span><span class="lines">@@ -319,7 +317,7 @@
</span><span class="cx">         return (u&quot;&quot;.join(queryTokens), recordTypes)
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def _queryStringFromExpression(self, expression, recordTypes=None):
</del><ins>+    def _queryStringAndRecordTypesFromExpression(self, expression, recordTypes=set([t.value for t in ODRecordType.iterconstants()])):
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Converts either a MatchExpression or a CompoundExpression into an LDAP
</span><span class="cx">         query string.
</span><span class="lines">@@ -335,12 +333,13 @@
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx"> 
</span><span class="cx">         if isinstance(expression, MatchExpression):
</span><del>-            return self._queryStringFromMatchExpression(
</del><ins>+            queryString, recordType = self._queryStringAndRecordTypeFromMatchExpression(
</ins><span class="cx">                 expression
</span><span class="cx">             )
</span><ins>+            return (queryString, recordType if recordType else recordTypes)
</ins><span class="cx"> 
</span><span class="cx">         if isinstance(expression, CompoundExpression):
</span><del>-            return self._queryStringFromCompoundExpression(
</del><ins>+            return self._queryStringAndRecordTypesFromCompoundExpression(
</ins><span class="cx">                 expression, recordTypes
</span><span class="cx">             )
</span><span class="cx"> 
</span><span class="lines">@@ -360,19 +359,24 @@
</span><span class="cx">         @rtype: L{ODQuery}
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx"> 
</span><del>-        queryString, recordTypes = self._queryStringFromExpression(expression)
</del><ins>+        queryString, recordTypes = self._queryStringAndRecordTypesFromExpression(
+            expression,
+        )
</ins><span class="cx">         if not recordTypes:
</span><span class="cx">             return None
</span><span class="cx"> 
</span><del>-        if queryString:
-            matchType = ODMatchType.compound.value
-        else:
-            matchType = ODMatchType.any.value
</del><ins>+        attributes = [a.value for a in ODAttribute.iterconstants()]
+        maxResults = 0
</ins><span class="cx"> 
</span><del>-        query, error = self._buildQuery(
-            recordTypes=recordTypes,
-            matchType=matchType,
-            queryString=queryString,
</del><ins>+        query, error = ODQuery.queryWithNode_forRecordTypes_attribute_matchType_queryValues_returnAttributes_maximumResults_error_(
+            self.node,
+            recordTypes,
+            None,
+            ODMatchType.compound.value if queryString else ODMatchType.any.value,
+            queryString,
+            attributes,
+            maxResults,
+            None
</ins><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx">         if error:
</span><span class="lines">@@ -417,6 +421,9 @@
</span><span class="cx">         else:
</span><span class="cx">             caseInsensitive = 0x0
</span><span class="cx"> 
</span><ins>+        fetchAttributes = [a.value for a in ODAttribute.iterconstants()]
+        maxResults = 0
+
</ins><span class="cx">         # For OpenDirectory, use guid for uid:
</span><span class="cx">         if expression.fieldName is self.fieldName.uid:
</span><span class="cx">             expression.fieldName = self.fieldName.guid
</span><span class="lines">@@ -430,9 +437,11 @@
</span><span class="cx">                     &quot;recordType argument does not match expression&quot;
</span><span class="cx">                 )
</span><span class="cx"> 
</span><del>-            recordTypes = ODRecordType.fromRecordType(expression.fieldValue)
</del><ins>+            recordTypes = ODRecordType.fromRecordType(
+                expression.fieldValue
+            ).value
</ins><span class="cx">             if MatchFlags.NOT in flags:
</span><del>-                recordTypes = None
</del><ins>+                recordTypes = set([t.value for t in ODRecordType.iterconstants()]) - recordTypes
</ins><span class="cx"> 
</span><span class="cx">             matchType = ODMatchType.any.value
</span><span class="cx">             queryAttribute = None
</span><span class="lines">@@ -443,9 +452,9 @@
</span><span class="cx">                 raise NotImplementedError()
</span><span class="cx"> 
</span><span class="cx">             if recordType is None:
</span><del>-                recordTypes = None
</del><ins>+                recordTypes = [t.value for t in ODRecordType.iterconstants()]
</ins><span class="cx">             else:
</span><del>-                recordTypes = (ODRecordType.fromRecordType(recordType),)
</del><ins>+                recordTypes = ODRecordType.fromRecordType(recordType).value
</ins><span class="cx"> 
</span><span class="cx">             queryAttribute = ODAttribute.fromFieldName(
</span><span class="cx">                 expression.fieldName
</span><span class="lines">@@ -458,11 +467,15 @@
</span><span class="cx">             else:
</span><span class="cx">                 queryValue = unicode(expression.fieldValue)
</span><span class="cx"> 
</span><del>-        query, error = self._buildQuery(
-            recordTypes=recordTypes,
-            matchType=(matchType | caseInsensitive),
-            queryAttribute=queryAttribute,
-            queryString=queryValue,
</del><ins>+        query, error = ODQuery.queryWithNode_forRecordTypes_attribute_matchType_queryValues_returnAttributes_maximumResults_error_(
+            self.node,
+            recordTypes,
+            queryAttribute,
+            matchType | caseInsensitive,
+            queryValue,
+            fetchAttributes,
+            maxResults,
+            None
</ins><span class="cx">         )
</span><span class="cx"> 
</span><span class="cx">         if error:
</span><span class="lines">@@ -477,39 +490,6 @@
</span><span class="cx">         return query
</span><span class="cx"> 
</span><span class="cx"> 
</span><del>-    def _buildQuery(
-        self, recordTypes, matchType, queryString, queryAttribute=None
-    ):
-        if not hasattr(self, &quot;_odQuery&quot;):
-            self._odQuery = getattr(
-                ODQuery,
-                &quot;queryWithNode_&quot;
-                &quot;forRecordTypes_&quot;
-                &quot;attribute_&quot;
-                &quot;matchType_&quot;
-                &quot;queryValues_&quot;
-                &quot;returnAttributes_&quot;
-                &quot;maximumResults_error_&quot;
-            )
-
-        if not hasattr(self, &quot;_odAttributes&quot;):
-            self._odAttributes = [a.value for a in ODAttribute.iterconstants()]
-
-        if recordTypes is None:
-            recordTypes = ODRecordType.itervalues()
-
-        return self._odQuery(
-            self.node,                       # node
-            (t.value for t in recordTypes),  # record types
-            queryAttribute,                  # attribute
-            matchType,                       # matchType
-            queryString,                     # queryString
-            self._odAttributes,              # return attributes
-            0,                               # max results
-            None                             # error
-        )
-
-
</del><span class="cx">     def _recordsFromQuery(self, query):
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Executes a query and generates directory records from it.
</span></span></pre>
</div>
</div>

</body>
</html>