<!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>[13523] 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/13523">13523</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-05-21 12:56:54 -0700 (Wed, 21 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Adds locations/resources to OD constants</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoopendirectory__init__py">twext/trunk/twext/who/opendirectory/__init__.py</a></li>
<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>
<li><a href="#twexttrunktwextwhoxmlpy">twext/trunk/twext/who/xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="twexttrunktwextwhoopendirectory__init__py"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/__init__.py (13522 => 13523)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/__init__.py 2014-05-21 15:07:02 UTC (rev 13522)
+++ twext/trunk/twext/who/opendirectory/__init__.py 2014-05-21 19:56:54 UTC (rev 13523)
</span><span class="lines">@@ -25,6 +25,7 @@
</span><span class="cx"> "OpenDirectoryDataError",
</span><span class="cx"> "DirectoryService",
</span><span class="cx"> "NoQOPDigestCredentialFactory",
</span><ins>+ "RecordType",
</ins><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -34,3 +35,4 @@
</span><span class="cx"> DirectoryService,
</span><span class="cx"> NoQOPDigestCredentialFactory,
</span><span class="cx"> )
</span><ins>+from ._constants import RecordType
</ins></span></pre></div>
<a id="twexttrunktwextwhoopendirectory_constantspy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_constants.py (13522 => 13523)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_constants.py 2014-05-21 15:07:02 UTC (rev 13522)
+++ twext/trunk/twext/who/opendirectory/_constants.py 2014-05-21 19:56:54 UTC (rev 13523)
</span><span class="lines">@@ -32,6 +32,21 @@
</span><span class="cx"> # idirectory constants
</span><span class="cx"> #
</span><span class="cx">
</span><ins>+class RecordType(Names):
+
+ user = NamedConstant()
+ user.description = u"user"
+
+ group = NamedConstant()
+ group.description = u"group"
+
+ location = NamedConstant()
+ location.description = u"location"
+
+ resource = NamedConstant()
+ resource.description = u"resource"
+
+
</ins><span class="cx"> class FieldName(Names):
</span><span class="cx"> searchPath = NamedConstant()
</span><span class="cx"> searchPath.description = u"search path"
</span><span class="lines">@@ -71,6 +86,12 @@
</span><span class="cx"> group = ValueConstant(u"dsRecTypeStandard:Groups")
</span><span class="cx"> group.recordType = BaseRecordType.group
</span><span class="cx">
</span><ins>+ location = ValueConstant(u"dsRecTypeStandard:Locations")
+ location.recordType = RecordType.location
+
+ resource = ValueConstant(u"dsRecTypeStandard:Resources")
+ resource.recordType = RecordType.resource
+
</ins><span class="cx"> # accessControl = ValueConstant(u"dsRecTypeStandard:AccessControls")
</span><span class="cx"> # afpServer = ValueConstant(u"dsRecTypeStandard:AFPServer")
</span><span class="cx"> # userAlias = ValueConstant(u"dsRecTypeStandard:AFPUserAliases")
</span><span class="lines">@@ -92,7 +113,6 @@
</span><span class="cx"> # hostServices = ValueConstant(u"dsRecTypeStandard:HostServices")
</span><span class="cx"> # host = ValueConstant(u"dsRecTypeStandard:Hosts")
</span><span class="cx"> # ldapServer = ValueConstant(u"dsRecTypeStandard:LDAPServer")
</span><del>- # location = ValueConstant(u"dsRecTypeStandard:Locations")
</del><span class="cx"> # machine = ValueConstant(u"dsRecTypeStandard:Machines")
</span><span class="cx"> # map = ValueConstant(u"dsRecTypeStandard:Maps")
</span><span class="cx"> # meta = ValueConstant(u"dsRecTypeStandard:AppleMetaRecord")
</span><span class="lines">@@ -115,7 +135,6 @@
</span><span class="cx"> # printer = ValueConstant(u"dsRecTypeStandard:Printers")
</span><span class="cx"> # protocol = ValueConstant(u"dsRecTypeStandard:Protocols")
</span><span class="cx"> # qtsServer = ValueConstant(u"dsRecTypeStandard:QTSServer")
</span><del>- # resource = ValueConstant(u"dsRecTypeStandard:Resources")
</del><span class="cx"> # rpc = ValueConstant(u"dsRecTypeStandard:RPC")
</span><span class="cx"> # smbServer = ValueConstant(u"dsRecTypeStandard:SMBServer")
</span><span class="cx"> # server = ValueConstant(u"dsRecTypeStandard:Server")
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_service.py (13522 => 13523)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py 2014-05-21 15:07:02 UTC (rev 13522)
+++ twext/trunk/twext/who/opendirectory/_service.py 2014-05-21 19:56:54 UTC (rev 13523)
</span><span class="lines">@@ -400,9 +400,9 @@
</span><span class="cx"> """
</span><span class="cx">
</span><span class="cx"> if local:
</span><ins>+ node = self.localNode
+ else:
</ins><span class="cx"> node = self.node
</span><del>- else:
- node = self.localNode
</del><span class="cx">
</span><span class="cx"> queryString, recordTypes = (
</span><span class="cx"> self._queryStringAndRecordTypesFromExpression(expression)
</span><span class="lines">@@ -526,9 +526,9 @@
</span><span class="cx"> queryValue = unicode(expression.fieldValue)
</span><span class="cx">
</span><span class="cx"> if local:
</span><ins>+ node = self.localNode
+ else:
</ins><span class="cx"> node = self.node
</span><del>- else:
- node = self.localNode
</del><span class="cx">
</span><span class="cx"> query, error = ODQuery.queryWithNode_forRecordTypes_attribute_matchType_queryValues_returnAttributes_maximumResults_error_(
</span><span class="cx"> node,
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectorytesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/test/test_service.py (13522 => 13523)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/test/test_service.py 2014-05-21 15:07:02 UTC (rev 13522)
+++ twext/trunk/twext/who/opendirectory/test/test_service.py 2014-05-21 19:56:54 UTC (rev 13523)
</span><span class="lines">@@ -78,7 +78,14 @@
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> recordTypes,
</span><del>- set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
</del><ins>+ set(
+ [
+ u"dsRecTypeStandard:Users",
+ u"dsRecTypeStandard:Groups",
+ u"dsRecTypeStandard:Locations",
+ u"dsRecTypeStandard:Resources",
+ ]
+ )
</ins><span class="cx"> )
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> queryString,
</span><span class="lines">@@ -101,7 +108,14 @@
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> recordTypes,
</span><del>- set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
</del><ins>+ set(
+ [
+ u"dsRecTypeStandard:Users",
+ u"dsRecTypeStandard:Groups",
+ u"dsRecTypeStandard:Locations",
+ u"dsRecTypeStandard:Resources",
+ ]
+ )
</ins><span class="cx"> )
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> queryString,
</span><span class="lines">@@ -125,7 +139,14 @@
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> recordTypes,
</span><del>- set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
</del><ins>+ set(
+ [
+ u"dsRecTypeStandard:Users",
+ u"dsRecTypeStandard:Groups",
+ u"dsRecTypeStandard:Locations",
+ u"dsRecTypeStandard:Resources",
+ ]
+ )
</ins><span class="cx"> )
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> queryString,
</span><span class="lines">@@ -152,7 +173,12 @@
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> recordTypes,
</span><del>- set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
</del><ins>+ set(
+ [
+ u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users",
+ u"dsRecTypeStandard:Locations", u"dsRecTypeStandard:Resources",
+ ]
+ )
</ins><span class="cx"> )
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> queryString,
</span><span class="lines">@@ -199,7 +225,14 @@
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> recordTypes,
</span><del>- set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
</del><ins>+ set(
+ [
+ u"dsRecTypeStandard:Users",
+ u"dsRecTypeStandard:Groups",
+ u"dsRecTypeStandard:Locations",
+ u"dsRecTypeStandard:Resources",
+ ]
+ )
</ins><span class="cx"> )
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> queryString,
</span><span class="lines">@@ -233,7 +266,14 @@
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> recordTypes,
</span><del>- set([u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users"])
</del><ins>+ set(
+ [
+ u"dsRecTypeStandard:Users",
+ u"dsRecTypeStandard:Groups",
+ u"dsRecTypeStandard:Locations",
+ u"dsRecTypeStandard:Resources",
+ ]
+ )
</ins><span class="cx"> )
</span><span class="cx"> self.assertEquals(
</span><span class="cx"> queryString,
</span><span class="lines">@@ -338,8 +378,17 @@
</span><span class="cx"> Operand.OR
</span><span class="cx"> )
</span><span class="cx"> queryString, recordTypes = service._queryStringAndRecordTypesFromExpression(expression)
</span><del>- self.assertEquals(set(recordTypes), set([u"dsRecTypeStandard:Groups"]))
</del><span class="cx"> self.assertEquals(
</span><ins>+ set(recordTypes),
+ set(
+ [
+ u"dsRecTypeStandard:Groups",
+ u"dsRecTypeStandard:Locations",
+ u"dsRecTypeStandard:Resources",
+ ]
+ )
+ )
+ self.assertEquals(
</ins><span class="cx"> queryString,
</span><span class="cx"> u"("
</span><span class="cx"> u"|(dsAttrTypeStandard:RecordName=xxxxx)"
</span></span></pre></div>
<a id="twexttrunktwextwhoxmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/xml.py (13522 => 13523)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/xml.py 2014-05-21 15:07:02 UTC (rev 13522)
+++ twext/trunk/twext/who/xml.py 2014-05-21 19:56:54 UTC (rev 13523)
</span><span class="lines">@@ -495,6 +495,8 @@
</span><span class="cx">
</span><span class="cx"> for value in values:
</span><span class="cx"> subNode = XMLElement(tag)
</span><ins>+ if isinstance(value, UUID):
+ value = str(value)
</ins><span class="cx"> subNode.text = value
</span><span class="cx"> recordNode.append(subNode)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>