<!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>[12612] 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/12612">12612</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2014-02-07 12:43:59 -0800 (Fri, 07 Feb 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>recordWithShortName() no longer does a compound query.
Raise QueryNotSupportedError in _queryStringFromMatchExpression() if record type is part of the query, since that's can't be expressed in a query string.
Add recordType argument to _queryFromMatchExpression() so that we can insert a record type filter.</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 (12611 => 12612)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py 2014-02-07 20:30:52 UTC (rev 12611)
+++ twext/trunk/twext/who/opendirectory/_service.py 2014-02-07 20:43:59 UTC (rev 12612)
</span><span class="lines">@@ -239,6 +239,12 @@
</span><span class="cx"> if expression.fieldName is self.fieldName.uid:
</span><span class="cx"> odAttr = ODAttribute.guid
</span><span class="cx"> value = expression.fieldValue
</span><ins>+
+ elif expression.fieldName is self.fieldName.recordType:
+ raise QueryNotSupportedError(
+ "Can't build a query string for record types."
+ )
+
</ins><span class="cx"> else:
</span><span class="cx"> odAttr = ODAttribute.fromFieldName(expression.fieldName)
</span><span class="cx"> if odAttr is None:
</span><span class="lines">@@ -350,13 +356,16 @@
</span><span class="cx"> return query
</span><span class="cx">
</span><span class="cx">
</span><del>- def _queryFromMatchExpression(self, expression):
</del><ins>+ def _queryFromMatchExpression(self, expression, recordType=None):
</ins><span class="cx"> """
</span><span class="cx"> Form an OpenDirectory query from a match expression.
</span><span class="cx">
</span><span class="cx"> @param expression: A match expression.
</span><span class="cx"> @type expression: L{MatchExpression}
</span><span class="cx">
</span><ins>+ @param recordType: A record type to insert into the query.
+ @type recordType: L{NamedConstant}
+
</ins><span class="cx"> @return: A native OpenDirectory query.
</span><span class="cx"> @rtype: L{ODQuery}
</span><span class="cx"> """
</span><span class="lines">@@ -388,6 +397,14 @@
</span><span class="cx"> expression.fieldName = self.fieldName.guid
</span><span class="cx">
</span><span class="cx"> if expression.fieldName is self.fieldName.recordType:
</span><ins>+ if (
+ recordType is not None and
+ expression.fieldValue is not recordType
+ ):
+ raise ValueError(
+ "recordType argument does not match expression"
+ )
+
</ins><span class="cx"> recordTypes = ODRecordType.fromRecordType(
</span><span class="cx"> expression.fieldValue
</span><span class="cx"> ).value
</span><span class="lines">@@ -396,11 +413,16 @@
</span><span class="cx"> queryValue = None
</span><span class="cx">
</span><span class="cx"> else:
</span><del>- recordTypes = [t.value for t in ODRecordType.iterconstants()]
</del><ins>+ if recordType is None:
+ recordTypes = [t.value for t in ODRecordType.iterconstants()]
+ else:
+ recordTypes = recordType
+
</ins><span class="cx"> queryAttribute = ODAttribute.fromFieldName(
</span><span class="cx"> expression.fieldName
</span><span class="cx"> ).value
</span><del>- # TODO: support other valuetypes:
</del><ins>+
+ # TODO: Add support other valuetypes:
</ins><span class="cx"> valueType = self.fieldName.valueType(expression.fieldName)
</span><span class="cx"> if valueType == UUID:
</span><span class="cx"> queryValue = unicode(expression.fieldValue).upper()
</span><span class="lines">@@ -480,7 +502,7 @@
</span><span class="cx"> return self._recordsFromQuery(query)
</span><span class="cx">
</span><span class="cx"> except QueryNotSupportedError:
</span><del>- pass
</del><ins>+ pass # Let the superclass try
</ins><span class="cx">
</span><span class="cx"> return BaseDirectoryService.recordsFromNonCompoundExpression(
</span><span class="cx"> self, expression
</span><span class="lines">@@ -517,7 +539,22 @@
</span><span class="cx"> return record
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def recordWithShortName(self, recordType, shortName):
+ try:
+ query = self._queryFromMatchExpression(
+ MatchExpression(self.fieldName.shortNames, shortName),
+ recordType=recordType
+ )
+ return self._recordsFromQuery(query)
</ins><span class="cx">
</span><ins>+ except QueryNotSupportedError:
+ # Let the superclass try
+ return BaseDirectoryService.recordWithShortName(
+ self, recordType, shortName
+ )
+
+
+
</ins><span class="cx"> @implementer(IPlaintextPasswordVerifier, IHTTPDigestVerifier)
</span><span class="cx"> class DirectoryRecord(BaseDirectoryRecord):
</span><span class="cx"> """
</span></span></pre>
</div>
</div>
</body>
</html>