<!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>[13771] 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/13771">13771</a></dd>
<dt>Author</dt> <dd>cdaboo@apple.com</dd>
<dt>Date</dt> <dd>2014-07-17 12:01:43 -0700 (Thu, 17 Jul 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Properly support OD recordType searches to enable resource/location migration to work.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#twexttrunktwextwhoaggregatepy">twext/trunk/twext/who/aggregate.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="twexttrunktwextwhoaggregatepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/aggregate.py (13770 => 13771)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/aggregate.py 2014-07-17 18:54:14 UTC (rev 13770)
+++ twext/trunk/twext/who/aggregate.py 2014-07-17 19:01:43 UTC (rev 13771)
</span><span class="lines">@@ -23,6 +23,7 @@
</span><span class="cx"> "DirectoryService",
</span><span class="cx"> ]
</span><span class="cx">
</span><ins>+import collections
</ins><span class="cx"> from itertools import chain
</span><span class="cx">
</span><span class="cx"> from twisted.internet.defer import (
</span><span class="lines">@@ -162,10 +163,16 @@
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def updateRecords(self, records, create=False):
</span><ins>+
+ # When migrating there may be lots of new records so batch this by each service record type
+ recordsByType = collections.defaultdict(list)
</ins><span class="cx"> for record in records:
</span><ins>+ recordsByType[record.recordType].append(record)
+
+ for recordType, recordList in recordsByType.items():
</ins><span class="cx"> for service in self.services:
</span><del>- if record.recordType in service.recordTypes():
- yield service.updateRecords([record], create=create)
</del><ins>+ if recordType in service.recordTypes():
+ yield service.updateRecords(recordList, create=create)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectory_constantspy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_constants.py (13770 => 13771)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_constants.py 2014-07-17 18:54:14 UTC (rev 13770)
+++ twext/trunk/twext/who/opendirectory/_constants.py 2014-07-17 19:01:43 UTC (rev 13771)
</span><span class="lines">@@ -71,7 +71,8 @@
</span><span class="cx"> group = ValueConstant(u"dsRecTypeStandard:Groups")
</span><span class="cx"> group.recordType = BaseRecordType.group
</span><span class="cx">
</span><del>- location = ValueConstant(u"dsRecTypeStandard:Locations")
</del><ins>+ #location = ValueConstant(u"dsRecTypeStandard:Locations")
+ place = ValueConstant(u"dsRecTypeStandard:Places")
</ins><span class="cx">
</span><span class="cx"> resource = ValueConstant(u"dsRecTypeStandard:Resources")
</span><span class="cx">
</span><span class="lines">@@ -107,7 +108,6 @@
</span><span class="cx"> # network = ValueConstant(u"dsRecTypeStandard:Networks")
</span><span class="cx"> # passwordServer = ValueConstant(u"dsRecTypeStandard:PasswordServer")
</span><span class="cx"> # person = ValueConstant(u"dsRecTypeStandard:People")
</span><del>- # place = ValueConstant(u"dsRecTypeStandard:Places")
</del><span class="cx"> # presetComputer = ValueConstant(u"dsRecTypeStandard:PresetComputers")
</span><span class="cx"> # presetComputerGroup = ValueConstant(u"dsRecTypeStandard:PresetComputerGroups")
</span><span class="cx"> # presetComputerList = ValueConstant(u"dsRecTypeStandard:PresetComputerLists")
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectory_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/_service.py (13770 => 13771)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/_service.py 2014-07-17 18:54:14 UTC (rev 13770)
+++ twext/trunk/twext/who/opendirectory/_service.py 2014-07-17 19:01:43 UTC (rev 13771)
</span><span class="lines">@@ -508,27 +508,33 @@
</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><del>- raise QueryNotSupportedError("RecordType match not supported")
</del><span class="cx">
</span><del>- if MatchFlags.NOT in flags:
- raise NotImplementedError()
</del><ins>+ queryAttribute = None
+ queryValue = None
+ matchType = ODMatchType.any.value
+ caseInsensitive = 0x0
</ins><span class="cx">
</span><del>- if recordTypes is None:
- odRecordTypes = [t.value for t in ODRecordType.iterconstants()]
</del><ins>+ odRecordTypes = [ODRecordType.fromRecordType(expression.fieldValue).value, ]
</ins><span class="cx"> else:
</span><del>- odRecordTypes = [ODRecordType.fromRecordType(r).value for r in recordTypes]
</del><ins>+ if MatchFlags.NOT in flags:
+ raise NotImplementedError()
</ins><span class="cx">
</span><del>- queryAttribute = ODAttribute.fromFieldName(
- expression.fieldName
- ).value
</del><ins>+ if recordTypes is None:
+ odRecordTypes = [t.value for t in ODRecordType.iterconstants()]
+ else:
+ odRecordTypes = [ODRecordType.fromRecordType(r).value for r in recordTypes]
</ins><span class="cx">
</span><del>- # TODO: Add support other value types:
- valueType = self.fieldName.valueType(expression.fieldName)
- if valueType == UUID:
- queryValue = unicode(expression.fieldValue).upper()
- else:
- queryValue = unicode(expression.fieldValue)
</del><ins>+ queryAttribute = ODAttribute.fromFieldName(
+ expression.fieldName
+ ).value
</ins><span class="cx">
</span><ins>+ # TODO: Add support other value types:
+ valueType = self.fieldName.valueType(expression.fieldName)
+ if valueType == UUID:
+ queryValue = unicode(expression.fieldValue).upper()
+ else:
+ queryValue = unicode(expression.fieldValue)
+
</ins><span class="cx"> if local:
</span><span class="cx"> node = self.localNode
</span><span class="cx"> else:
</span></span></pre></div>
<a id="twexttrunktwextwhoopendirectorytesttest_servicepy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/opendirectory/test/test_service.py (13770 => 13771)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/opendirectory/test/test_service.py 2014-07-17 18:54:14 UTC (rev 13770)
+++ twext/trunk/twext/who/opendirectory/test/test_service.py 2014-07-17 19:01:43 UTC (rev 13771)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> [
</span><span class="cx"> u"dsRecTypeStandard:Users",
</span><span class="cx"> u"dsRecTypeStandard:Groups",
</span><del>- u"dsRecTypeStandard:Locations",
</del><ins>+ u"dsRecTypeStandard:Places",
</ins><span class="cx"> u"dsRecTypeStandard:Resources",
</span><span class="cx"> ]
</span><span class="cx"> )
</span><span class="lines">@@ -112,7 +112,7 @@
</span><span class="cx"> [
</span><span class="cx"> u"dsRecTypeStandard:Users",
</span><span class="cx"> u"dsRecTypeStandard:Groups",
</span><del>- u"dsRecTypeStandard:Locations",
</del><ins>+ u"dsRecTypeStandard:Places",
</ins><span class="cx"> u"dsRecTypeStandard:Resources",
</span><span class="cx"> ]
</span><span class="cx"> )
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> [
</span><span class="cx"> u"dsRecTypeStandard:Users",
</span><span class="cx"> u"dsRecTypeStandard:Groups",
</span><del>- u"dsRecTypeStandard:Locations",
</del><ins>+ u"dsRecTypeStandard:Places",
</ins><span class="cx"> u"dsRecTypeStandard:Resources",
</span><span class="cx"> ]
</span><span class="cx"> )
</span><span class="lines">@@ -176,7 +176,7 @@
</span><span class="cx"> set(
</span><span class="cx"> [
</span><span class="cx"> u"dsRecTypeStandard:Groups", u"dsRecTypeStandard:Users",
</span><del>- u"dsRecTypeStandard:Locations", u"dsRecTypeStandard:Resources",
</del><ins>+ u"dsRecTypeStandard:Places", u"dsRecTypeStandard:Resources",
</ins><span class="cx"> ]
</span><span class="cx"> )
</span><span class="cx"> )
</span><span class="lines">@@ -229,7 +229,7 @@
</span><span class="cx"> [
</span><span class="cx"> u"dsRecTypeStandard:Users",
</span><span class="cx"> u"dsRecTypeStandard:Groups",
</span><del>- u"dsRecTypeStandard:Locations",
</del><ins>+ u"dsRecTypeStandard:Places",
</ins><span class="cx"> u"dsRecTypeStandard:Resources",
</span><span class="cx"> ]
</span><span class="cx"> )
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> [
</span><span class="cx"> u"dsRecTypeStandard:Users",
</span><span class="cx"> u"dsRecTypeStandard:Groups",
</span><del>- u"dsRecTypeStandard:Locations",
</del><ins>+ u"dsRecTypeStandard:Places",
</ins><span class="cx"> u"dsRecTypeStandard:Resources",
</span><span class="cx"> ]
</span><span class="cx"> )
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> set(
</span><span class="cx"> [
</span><span class="cx"> u"dsRecTypeStandard:Groups",
</span><del>- u"dsRecTypeStandard:Locations",
</del><ins>+ u"dsRecTypeStandard:Places",
</ins><span class="cx"> u"dsRecTypeStandard:Resources",
</span><span class="cx"> ]
</span><span class="cx"> )
</span></span></pre></div>
<a id="twexttrunktwextwhoxmlpy"></a>
<div class="modfile"><h4>Modified: twext/trunk/twext/who/xml.py (13770 => 13771)</h4>
<pre class="diff"><span>
<span class="info">--- twext/trunk/twext/who/xml.py 2014-07-17 18:54:14 UTC (rev 13770)
+++ twext/trunk/twext/who/xml.py 2014-07-17 19:01:43 UTC (rev 13771)
</span><span class="lines">@@ -472,6 +472,7 @@
</span><span class="cx"> directoryNode = self._directoryNodeForEditing()
</span><span class="cx">
</span><span class="cx"> def fillRecordNode(recordNode, record):
</span><ins>+ subNode = None
</ins><span class="cx"> for (name, value) in record.fields.items():
</span><span class="cx"> if name == self.fieldName.recordType:
</span><span class="cx"> if value in recordTypes:
</span><span class="lines">@@ -498,6 +499,7 @@
</span><span class="cx"> if isinstance(value, UUID):
</span><span class="cx"> value = str(value)
</span><span class="cx"> subNode.text = value
</span><ins>+ subNode.tail = "\n "
</ins><span class="cx"> recordNode.append(subNode)
</span><span class="cx">
</span><span class="cx"> else:
</span><span class="lines">@@ -505,6 +507,11 @@
</span><span class="cx"> "Unknown field name: {0!r}".format(name)
</span><span class="cx"> )
</span><span class="cx">
</span><ins>+ if subNode is not None:
+ subNode.tail = "\n"
+ recordNode.text = "\n "
+ recordNode.tail = "\n"
+
</ins><span class="cx"> # Walk through the record nodes in the XML tree and apply
</span><span class="cx"> # updates.
</span><span class="cx"> for recordNode in directoryNode:
</span></span></pre>
</div>
</div>
</body>
</html>