<!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>[12164] 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/12164">12164</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-12-19 19:20:07 -0800 (Thu, 19 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Comment out _queryStringFromExpression, _queryFromCompoundExpression, recordsFromCompoundExpression.
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.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoopendirectory_scriptspy">twext/trunk/twext/who/opendirectory/_scripts.py</a></li>
<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_scriptspy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_scripts.py (12163 => 12164)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_scripts.py        2013-12-20 02:50:06 UTC (rev 12163)
+++ twext/trunk/twext/who/opendirectory/_scripts.py        2013-12-20 03:20:07 UTC (rev 12164)
</span><span class="lines">@@ -206,11 +206,6 @@
</span><span class="cx"> service.fieldName.shortNames, shortName,
</span><span class="cx"> matchType=MatchType.equals,
</span><span class="cx"> )
</span><del>- queryString = service._queryStringFromExpression(matchExpression)
- print(
- "\n...via MatchExpression, query={query!r}\n"
- .format(query=queryString)
- )
</del><span class="cx">
</span><span class="cx"> records = yield service.recordsFromExpression(matchExpression)
</span><span class="cx"> for record in records:
</span><span class="lines">@@ -229,11 +224,6 @@
</span><span class="cx"> ],
</span><span class="cx"> Operand.OR
</span><span class="cx"> )
</span><del>- queryString = service._queryStringFromExpression(compoundExpression)
- print(
- "\n...via CompoundExpression, query={query!r}\n"
- .format(query=queryString)
- )
</del><span class="cx">
</span><span class="cx"> records = yield service.recordsFromExpression(compoundExpression)
</span><span class="cx"> for record in records:
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_service.py (12163 => 12164)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py        2013-12-20 02:50:06 UTC (rev 12163)
+++ twext/trunk/twext/who/opendirectory/_service.py        2013-12-20 03:20:07 UTC (rev 12164)
</span><span class="lines">@@ -45,7 +45,8 @@
</span><span class="cx"> DirectoryRecord as BaseDirectoryRecord,
</span><span class="cx"> )
</span><span class="cx"> from ..expression import (
</span><del>- CompoundExpression, Operand, MatchExpression, MatchType, MatchFlags,
</del><ins>+ # CompoundExpression, Operand,
+ MatchExpression, MatchType, MatchFlags,
</ins><span class="cx"> )
</span><span class="cx"> from ..util import iterFlags, ConstantsContainer
</span><span class="cx">
</span><span class="lines">@@ -346,107 +347,108 @@
</span><span class="cx"> self._node = node
</span><span class="cx">
</span><span class="cx">
</span><del>- def _queryStringFromExpression(self, expression):
- """
- Converts either a MatchExpression or a CompoundExpression into a native
- OpenDirectory query string.
</del><ins>+ # def _queryStringFromExpression(self, expression):
+ # """
+ # Converts either a MatchExpression or a CompoundExpression into a
+ # native OpenDirectory query string.
</ins><span class="cx">
</span><del>- @param expression: The expression
- @type expression: Either L{MatchExpression} or L{CompoundExpression}
</del><ins>+ # @param expression: The expression
+ # @type expression: Either L{MatchExpression} or L{CompoundExpression}
</ins><span class="cx">
</span><del>- @return: A native OpenDirectory query string
- @rtype: C{unicode}
- """
</del><ins>+ # @return: A native OpenDirectory query string
+ # @rtype: C{unicode}
+ # """
</ins><span class="cx">
</span><del>- if isinstance(expression, MatchExpression):
- matchType = ODMatchType.fromMatchType(expression.matchType)
- if matchType is None:
- raise QueryNotSupportedError(
- "Unknown match type: {0}".format(matchType)
- )
</del><ins>+ # if isinstance(expression, MatchExpression):
+ # matchType = ODMatchType.fromMatchType(expression.matchType)
+ # if matchType is None:
+ # raise QueryNotSupportedError(
+ # "Unknown match type: {0}".format(matchType)
+ # )
</ins><span class="cx">
</span><del>- if expression.fieldName is self.fieldName.uid:
- odAttr = ODAttribute.guid.value
- value = expression.fieldValue
- else:
- odAttr = ODAttribute.fromFieldName(expression.fieldName)
- if odAttr is None:
- raise OpenDirectoryQueryError(
- "Unknown field name: {0}".format(expression.fieldName)
- )
- odAttr = odAttr.value
- value = expression.fieldValue
</del><ins>+ # if expression.fieldName is self.fieldName.uid:
+ # odAttr = ODAttribute.guid.value
+ # value = expression.fieldValue
+ # else:
+ # odAttr = ODAttribute.fromFieldName(expression.fieldName)
+ # if odAttr is None:
+ # raise OpenDirectoryQueryError(
+ # "Unknown field name: {0}"
+ # .format(expression.fieldName)
+ # )
+ # odAttr = odAttr.value
+ # value = expression.fieldValue
</ins><span class="cx">
</span><del>- value = unicode(value)
</del><ins>+ # value = unicode(value)
</ins><span class="cx">
</span><del>- # FIXME: Shouldn't the value be quoted somehow?
- queryString = {
- ODMatchType.equals.value: u"({attr}={value})",
- ODMatchType.startsWith.value: u"({attr}={value}*)",
- ODMatchType.endsWith.value: u"({attr}=*{value})",
- ODMatchType.contains.value: u"({attr}=*{value}*)",
- ODMatchType.lessThan.value: u"({attr}<{value})",
- ODMatchType.greaterThan.value: u"({attr}>{value})",
- }.get(matchType.value, u"({attr}=*{value}*)").format(
- attr=odAttr,
- value=value
- )
</del><ins>+ # # FIXME: Shouldn't the value be quoted somehow?
+ # queryString = {
+ # ODMatchType.equals.value: u"({attr}={value})",
+ # ODMatchType.startsWith.value: u"({attr}={value}*)",
+ # ODMatchType.endsWith.value: u"({attr}=*{value})",
+ # ODMatchType.contains.value: u"({attr}=*{value}*)",
+ # ODMatchType.lessThan.value: u"({attr}<{value})",
+ # ODMatchType.greaterThan.value: u"({attr}>{value})",
+ # }.get(matchType.value, u"({attr}=*{value}*)").format(
+ # attr=odAttr,
+ # value=value
+ # )
</ins><span class="cx">
</span><del>- elif isinstance(expression, CompoundExpression):
- queryString = u""
- operand = u"&" if expression.operand is Operand.AND else u"|"
</del><ins>+ # elif isinstance(expression, CompoundExpression):
+ # queryString = u""
+ # operand = u"&" if expression.operand is Operand.AND else u"|"
</ins><span class="cx">
</span><del>- if len(expression.expressions) > 1:
- queryString += u"("
- queryString += operand
</del><ins>+ # if len(expression.expressions) > 1:
+ # queryString += u"("
+ # queryString += operand
</ins><span class="cx">
</span><del>- for subExpression in expression.expressions:
- queryString += self._queryStringFromExpression(subExpression)
</del><ins>+ # for subExpression in expression.expressions:
+ # queryString += self._queryStringFromExpression(subExpression)
</ins><span class="cx">
</span><del>- if len(expression.expressions) > 1:
- queryString += u")"
</del><ins>+ # if len(expression.expressions) > 1:
+ # queryString += u")"
</ins><span class="cx">
</span><del>- return queryString
</del><ins>+ # return queryString
</ins><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: The 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><span class="cx">
</span><span class="lines">@@ -474,20 +476,23 @@
</span><span class="cx"> else:
</span><span class="cx"> caseInsensitive = 0x0
</span><span class="cx">
</span><ins>+ attributes = [a.value for a in ODAttribute.iterconstants()]
+ maxResults = 0
+
</ins><span class="cx"> if expression.fieldName is self.fieldName.recordType:
</span><del>- raise NotImplementedError()
</del><ins>+ recordTypes = ODRecordType.fromRecordType(expression.fieldValue)
+ queryValue = None
</ins><span class="cx">
</span><span class="cx"> else:
</span><span class="cx"> recordTypes = [t.value for t in ODRecordType.iterconstants()]
</span><del>- attributes = [a.value for a in ODAttribute.iterconstants()]
- maxResults = 0
</del><ins>+ queryValue = expression.fieldValue
</ins><span class="cx">
</span><span class="cx"> query, error = ODQuery.queryWithNode_forRecordTypes_attribute_matchType_queryValues_returnAttributes_maximumResults_error_(
</span><span class="cx"> self.node,
</span><span class="cx"> recordTypes,
</span><span class="cx"> ODAttribute.fromFieldName(expression.fieldName).value,
</span><span class="cx"> matchType.value | caseInsensitive,
</span><del>- expression.fieldValue,
</del><ins>+ queryValue,
</ins><span class="cx"> attributes,
</span><span class="cx"> maxResults,
</span><span class="cx"> None
</span><span class="lines">@@ -516,6 +521,10 @@
</span><span class="cx"> @rtype: iterable of L{DirectoryRecord}
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ # FIXME: This is blocking.
+ # We can call scheduleInRunLoop:forMode:, which will call back to
+ # its delegate...
+
</ins><span class="cx"> odRecords, error = query.resultsAllowingPartial_error_(False, None)
</span><span class="cx">
</span><span class="cx"> if error:
</span><span class="lines">@@ -527,15 +536,14 @@
</span><span class="cx"> "Unable to execute OpenDirectory query", error
</span><span class="cx"> )
</span><span class="cx">
</span><del>- for odRecord in odRecords:
- yield DirectoryRecord(self, odRecord)
</del><ins>+ return succeed(DirectoryRecord(self, odr) for odr in odRecords)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def recordsFromNonCompoundExpression(self, expression, records=None):
</span><span class="cx"> if isinstance(expression, MatchExpression):
</span><span class="cx"> try:
</span><span class="cx"> query = self._queryFromMatchExpression(expression)
</span><del>- return succeed(self._recordsFromQuery(query))
</del><ins>+ return self._recordsFromQuery(query)
</ins><span class="cx">
</span><span class="cx"> except QueryNotSupportedError:
</span><span class="cx"> pass
</span><span class="lines">@@ -545,15 +553,26 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- def recordsFromCompoundExpression(self, expression, records=None):
- try:
- query = self._queryFromCompoundExpression(expression)
- return succeed(self._recordsFromQuery(query))
</del><ins>+ #
+ # 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)
</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>
<a id="twexttrunktwextwhoopendirectorytesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/test/test_service.py (12163 => 12164)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/test/test_service.py        2013-12-20 02:50:06 UTC (rev 12163)
+++ twext/trunk/twext/who/opendirectory/test/test_service.py        2013-12-20 03:20:07 UTC (rev 12164)
</span><span class="lines">@@ -20,10 +20,10 @@
</span><span class="cx">
</span><span class="cx"> from twisted.trial import unittest
</span><span class="cx">
</span><del>-from ...expression import (
- CompoundExpression, MatchExpression, MatchType, Operand
-)
-from .._service import DirectoryService
</del><ins>+# from ...expression import (
+# CompoundExpression, MatchExpression, MatchType, Operand
+# )
+# from .._service import DirectoryService
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -32,89 +32,89 @@
</span><span class="cx"> Tests for L{DirectoryService}.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def test_queryStringFromExpression(self):
- service = DirectoryService()
</del><ins>+ # def test_queryStringFromExpression(self):
+ # service = DirectoryService()
</ins><span class="cx">
</span><del>- # MatchExpressions
</del><ins>+ # # MatchExpressions
</ins><span class="cx">
</span><del>- for matchType, expected in (
- (MatchType.equals, u"=xyzzy"),
- (MatchType.startsWith, u"=xyzzy*"),
- (MatchType.endsWith, u"=*xyzzy"),
- (MatchType.contains, u"=*xyzzy*"),
- ):
- expression = MatchExpression(
- service.fieldName.shortNames, u"xyzzy",
- matchType=matchType
- )
- queryString = service._queryStringFromExpression(expression)
- self.assertEquals(
- queryString,
- u"(dsAttrTypeStandard:RecordName{exp})".format(exp=expected)
- )
</del><ins>+ # for matchType, expected in (
+ # (MatchType.equals, u"=xyzzy"),
+ # (MatchType.startsWith, u"=xyzzy*"),
+ # (MatchType.endsWith, u"=*xyzzy"),
+ # (MatchType.contains, u"=*xyzzy*"),
+ # ):
+ # expression = MatchExpression(
+ # service.fieldName.shortNames, u"xyzzy",
+ # matchType=matchType
+ # )
+ # queryString = service._queryStringFromExpression(expression)
+ # self.assertEquals(
+ # queryString,
+ # u"(dsAttrTypeStandard:RecordName{exp})".format(exp=expected)
+ # )
</ins><span class="cx">
</span><del>- # CompoundExpressions
</del><ins>+ # # CompoundExpressions
</ins><span class="cx">
</span><del>- expression = CompoundExpression(
- [
- MatchExpression(
- service.fieldName.uid, u"a",
- matchType=MatchType.contains
- ),
- MatchExpression(
- service.fieldName.guid, u"b",
- matchType=MatchType.contains
- ),
- MatchExpression(
- service.fieldName.shortNames, u"c",
- matchType=MatchType.contains
- ),
- MatchExpression(
- service.fieldName.emailAddresses, u"d",
- matchType=MatchType.startsWith
- ),
- MatchExpression(
- service.fieldName.fullNames, u"e",
- matchType=MatchType.equals
- ),
- ],
- Operand.AND
- )
- queryString = service._queryStringFromExpression(expression)
- self.assertEquals(
- queryString,
- (
- u"(&(dsAttrTypeStandard:GeneratedUID=*a*)"
- u"(dsAttrTypeStandard:GeneratedUID=*b*)"
- u"(dsAttrTypeStandard:RecordName=*c*)"
- u"(dsAttrTypeStandard:EMailAddress=d*)"
- u"(dsAttrTypeStandard:RealName=e))"
- )
- )
</del><ins>+ # expression = CompoundExpression(
+ # [
+ # MatchExpression(
+ # service.fieldName.uid, u"a",
+ # matchType=MatchType.contains
+ # ),
+ # MatchExpression(
+ # service.fieldName.guid, u"b",
+ # matchType=MatchType.contains
+ # ),
+ # MatchExpression(
+ # service.fieldName.shortNames, u"c",
+ # matchType=MatchType.contains
+ # ),
+ # MatchExpression(
+ # service.fieldName.emailAddresses, u"d",
+ # matchType=MatchType.startsWith
+ # ),
+ # MatchExpression(
+ # service.fieldName.fullNames, u"e",
+ # matchType=MatchType.equals
+ # ),
+ # ],
+ # Operand.AND
+ # )
+ # queryString = service._queryStringFromExpression(expression)
+ # self.assertEquals(
+ # queryString,
+ # (
+ # u"(&(dsAttrTypeStandard:GeneratedUID=*a*)"
+ # u"(dsAttrTypeStandard:GeneratedUID=*b*)"
+ # u"(dsAttrTypeStandard:RecordName=*c*)"
+ # u"(dsAttrTypeStandard:EMailAddress=d*)"
+ # u"(dsAttrTypeStandard:RealName=e))"
+ # )
+ # )
</ins><span class="cx">
</span><del>- expression = CompoundExpression(
- [
- MatchExpression(
- service.fieldName.shortNames, u"a",
- matchType=MatchType.contains
- ),
- MatchExpression(
- service.fieldName.emailAddresses, u"b",
- matchType=MatchType.startsWith
- ),
- MatchExpression(
- service.fieldName.fullNames, u"c",
- matchType=MatchType.equals
- ),
- ],
- Operand.OR
- )
- queryString = service._queryStringFromExpression(expression)
- self.assertEquals(
- queryString,
- (
- u"(|(dsAttrTypeStandard:RecordName=*a*)"
- u"(dsAttrTypeStandard:EMailAddress=b*)"
- u"(dsAttrTypeStandard:RealName=c))"
- )
- )
</del><ins>+ # expression = CompoundExpression(
+ # [
+ # MatchExpression(
+ # service.fieldName.shortNames, u"a",
+ # matchType=MatchType.contains
+ # ),
+ # MatchExpression(
+ # service.fieldName.emailAddresses, u"b",
+ # matchType=MatchType.startsWith
+ # ),
+ # MatchExpression(
+ # service.fieldName.fullNames, u"c",
+ # matchType=MatchType.equals
+ # ),
+ # ],
+ # Operand.OR
+ # )
+ # queryString = service._queryStringFromExpression(expression)
+ # self.assertEquals(
+ # queryString,
+ # (
+ # u"(|(dsAttrTypeStandard:RecordName=*a*)"
+ # u"(dsAttrTypeStandard:EMailAddress=b*)"
+ # u"(dsAttrTypeStandard:RealName=c))"
+ # )
+ # )
</ins></span></pre>
</div>
</div>
</body>
</html>