<!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>[12251] 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/12251">12251</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-01-06 18:40:28 -0800 (Mon, 06 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Support NOT flag in _queryStringFromMatchExpression.
_queryFromMatchExpression() raises NotImplementedError in that case now.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoopendirectory_constantspy">twext/trunk/twext/who/opendirectory/_constants.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_constantspy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_constants.py (12250 => 12251)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_constants.py        2014-01-07 02:15:58 UTC (rev 12250)
+++ twext/trunk/twext/who/opendirectory/_constants.py        2014-01-07 02:40:28 UTC (rev 12251)
</span><span class="lines">@@ -389,39 +389,39 @@
</span><span class="cx">
</span><span class="cx"> class ODMatchType(Values):
</span><span class="cx"> all = ValueConstant(0x0001)
</span><del>- all.queryString = u"({attribute}=*)"
</del><ins>+ all.queryString = u"({notOp}{attribute}=*)"
</ins><span class="cx">
</span><span class="cx"> equals = ValueConstant(0x2001)
</span><span class="cx"> equals.matchType = MatchType.equals
</span><del>- equals.queryString = u"({attribute}={value})"
</del><ins>+ equals.queryString = u"({notOp}{attribute}={value})"
</ins><span class="cx">
</span><span class="cx"> startsWith = ValueConstant(0x2002)
</span><span class="cx"> startsWith.matchType = MatchType.startsWith
</span><del>- startsWith.queryString = u"({attribute}={value}*)"
</del><ins>+ startsWith.queryString = u"({notOp}{attribute}={value}*)"
</ins><span class="cx">
</span><span class="cx"> endsWith = ValueConstant(0x2003)
</span><span class="cx"> endsWith.matchType = MatchType.endsWith
</span><del>- endsWith.queryString = u"({attribute}=*{value})"
</del><ins>+ endsWith.queryString = u"({notOp}{attribute}=*{value})"
</ins><span class="cx">
</span><span class="cx"> contains = ValueConstant(0x2004)
</span><span class="cx"> contains.matchType = MatchType.contains
</span><del>- contains.queryString = u"({attribute}=*{value}*)"
</del><ins>+ contains.queryString = u"({notOp}{attribute}=*{value}*)"
</ins><span class="cx">
</span><span class="cx"> lessThan = ValueConstant(0x2005)
</span><span class="cx"> lessThan.matchType = MatchType.lessThan
</span><del>- lessThan.queryString = u"({attribute}<{value})"
</del><ins>+ lessThan.queryString = u"({notOp}{attribute}<{value})"
</ins><span class="cx">
</span><span class="cx"> greaterThan = ValueConstant(0x2006)
</span><span class="cx"> greaterThan.matchType = MatchType.greaterThan
</span><del>- greaterThan.queryString = u"({attribute}>{value})"
</del><ins>+ greaterThan.queryString = u"({notOp}{attribute}>{value})"
</ins><span class="cx">
</span><span class="cx"> lessThanOrEqualTo = ValueConstant(0x2007)
</span><span class="cx"> lessThanOrEqualTo.matchType = MatchType.lessThanOrEqualTo
</span><del>- lessThanOrEqualTo.queryString = u"({attribute}<={value})"
</del><ins>+ lessThanOrEqualTo.queryString = u"({notOp}{attribute}<={value})"
</ins><span class="cx">
</span><span class="cx"> greaterThanOrEqualTo = ValueConstant(0x2008)
</span><span class="cx"> greaterThanOrEqualTo.matchType = MatchType.greaterThanOrEqualTo
</span><del>- greaterThanOrEqualTo.queryString = u"({attribute}>={value})"
</del><ins>+ greaterThanOrEqualTo.queryString = u"({notOp}{attribute}>={value})"
</ins><span class="cx">
</span><span class="cx"> compound = ValueConstant(0x210B)
</span><span class="cx">
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_service.py (12250 => 12251)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py        2014-01-07 02:15:58 UTC (rev 12250)
+++ twext/trunk/twext/who/opendirectory/_service.py        2014-01-07 02:40:28 UTC (rev 12251)
</span><span class="lines">@@ -245,8 +245,12 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx"> flags = tuple(iterFlags(expression.flags))
</span><ins>+
</ins><span class="cx"> if MatchFlags.NOT in flags:
</span><del>- raise NotImplementedError("Need to handle NOT")
</del><ins>+ notOp = u"!"
+ else:
+ notOp = u""
+
</ins><span class="cx"> if MatchFlags.caseInsensitive in flags:
</span><span class="cx"> raise NotImplementedError("Need to handle caseInsensitive")
</span><span class="cx">
</span><span class="lines">@@ -266,7 +270,7 @@
</span><span class="cx">
</span><span class="cx"> # FIXME: Shouldn't the value be quoted somehow?
</span><span class="cx"> return matchType.queryString.format(
</span><del>- attribute=odAttr.value, value=value
</del><ins>+ notOp=notOp, attribute=odAttr.value, value=value
</ins><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -385,7 +389,12 @@
</span><span class="cx"> )
</span><span class="cx"> matchType = matchType.value
</span><span class="cx">
</span><del>- if MatchFlags.caseInsensitive in iterFlags(expression.flags):
</del><ins>+ flags = tuple(iterFlags(expression.flags))
+
+ if MatchFlags.NOT in flags:
+ raise NotImplementedError()
+
+ if MatchFlags.caseInsensitive in flags:
</ins><span class="cx"> caseInsensitive = 0x100
</span><span class="cx"> else:
</span><span class="cx"> caseInsensitive = 0x0
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectorytesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/test/test_service.py (12250 => 12251)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/test/test_service.py        2014-01-07 02:15:58 UTC (rev 12250)
+++ twext/trunk/twext/who/opendirectory/test/test_service.py        2014-01-07 02:40:28 UTC (rev 12251)
</span><span class="lines">@@ -83,9 +83,7 @@
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="cx">
</span><del>- test_queryStringFromMatchExpression_match_not.todo = "unimplemented"
</del><span class="cx">
</span><del>-
</del><span class="cx"> def test_queryStringFromMatchExpression_match_caseInsensitive(self):
</span><span class="cx"> """
</span><span class="cx"> Match expression with the C{caseInsensitive} flag adds the C{??????}
</span></span></pre>
</div>
</div>
</body>
</html>