<!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>[12123] twext/trunk/twext/who</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/12123">12123</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2013-12-17 14:30:35 -0800 (Tue, 17 Dec 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Add a constant for the 'compound' match type, and have the script do both match expression and compound expression</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoexpressionpy">twext/trunk/twext/who/expression.py</a></li>
<li><a href="#twexttrunktwextwhoopendirectoryservicepy">twext/trunk/twext/who/opendirectory/service.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhoexpressionpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/expression.py (12122 => 12123)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/expression.py 2013-12-17 22:15:26 UTC (rev 12122)
+++ twext/trunk/twext/who/expression.py 2013-12-17 22:30:35 UTC (rev 12123)
</span><span class="lines">@@ -96,8 +96,11 @@
</span><span class="cx"> greaterThanOrEqualTo = NamedConstant()
</span><span class="cx"> greaterThanOrEqualTo.description = u"greater than or equal to"
</span><span class="cx">
</span><ins>+ compound = NamedConstant()
+ compound.description = u"compound expression"
</ins><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> class MatchFlags(Flags):
</span><span class="cx"> """
</span><span class="cx"> Match expression flags.
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectoryservicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/service.py (12122 => 12123)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/service.py 2013-12-17 22:15:26 UTC (rev 12122)
+++ twext/trunk/twext/who/opendirectory/service.py 2013-12-17 22:30:35 UTC (rev 12123)
</span><span class="lines">@@ -197,6 +197,8 @@
</span><span class="cx"> greaterThanOrEqualTo = ValueConstant(0x2008)
</span><span class="cx"> greaterThanOrEqualTo.matchType = MatchType.greaterThanOrEqualTo
</span><span class="cx">
</span><ins>+ compound = ValueConstant(0x210B)
+ compound.matchType = MatchType.compound
</ins><span class="cx">
</span><span class="cx"> @classmethod
</span><span class="cx"> def fromMatchType(cls, matchType):
</span><span class="lines">@@ -391,7 +393,7 @@
</span><span class="cx"> self.node,
</span><span class="cx"> recordTypes,
</span><span class="cx"> None,
</span><del>- 0x210B, # kODMatchCompoundExpression
</del><ins>+ ODMatchType.compound.value,
</ins><span class="cx"> queryString,
</span><span class="cx"> attributes,
</span><span class="cx"> maxResults,
</span><span class="lines">@@ -615,10 +617,36 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> for shortName in sys.argv:
</span><del>- matchMorgen = MatchExpression(
</del><ins>+ print("=" * 80)
+ matchExpression = MatchExpression(
</ins><span class="cx"> service.fieldName.shortNames, shortName,
</span><span class="cx"> matchType=MatchType.equals,
</span><span class="cx"> )
</span><del>- for record in service.recordsFromExpression(matchMorgen):
</del><ins>+ queryString = service._queryStringFromExpression(matchExpression)
+ print("{name} via MatchExpression using query {query}".format(
+ name=shortName, query=queryString))
+ for record in service.recordsFromExpression(matchExpression):
</ins><span class="cx"> print("*" * 80)
</span><span class="cx"> print(record.description())
</span><ins>+
+ print("=" * 80)
+
+ compoundExpression = CompoundExpression(
+ [
+ MatchExpression(
+ service.fieldName.shortNames, shortName,
+ matchType=MatchType.contains
+ ),
+ MatchExpression(
+ service.fieldName.emailAddresses, shortName,
+ matchType=MatchType.contains
+ ),
+ ],
+ Operand.OR
+ )
+ queryString = service._queryStringFromExpression(compoundExpression)
+ print("{name} via CompoundExpression using query {query}".format(
+ name=shortName, query=queryString))
+ for record in service.recordsFromExpression(compoundExpression):
+ print("*" * 80)
+ print(record.description())
</ins></span></pre>
</div>
</div>
</body>
</html>