<!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>[10675] CalendarServer/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/10675">10675</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-02-11 10:49:10 -0800 (Mon, 11 Feb 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Work on mutable records.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextwhodirectorypy">CalendarServer/trunk/twext/who/directory.py</a></li>
<li><a href="#CalendarServertrunktwextwhotesttest_xmlpy">CalendarServer/trunk/twext/who/test/test_xml.py</a></li>
<li><a href="#CalendarServertrunktwextwhoxmlpy">CalendarServer/trunk/twext/who/xml.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwextwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/directory.py (10674 => 10675)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/directory.py 2013-02-11 15:20:35 UTC (rev 10674)
+++ CalendarServer/trunk/twext/who/directory.py 2013-02-11 18:49:10 UTC (rev 10675)
</span><span class="lines">@@ -192,6 +192,28 @@
</span><span class="cx"> raise AttributeError(name)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ def description(self):
+ description = [self.__class__.__name__, ":"]
+
+ for name, value in self.fields.items():
+ if hasattr(name, "description"):
+ name = name.description
+ else:
+ name = str(name)
+
+ if hasattr(value, "description"):
+ value = value.description
+ else:
+ value = str(value)
+
+ description.append("\n ")
+ description.append(name)
+ description.append(" = ")
+ description.append(value)
+
+ return "".join(description)
+
+
</ins><span class="cx"> def members(self):
</span><span class="cx"> if self.recordType == RecordType.group:
</span><span class="cx"> raise NotImplementedError()
</span></span></pre></div>
<a id="CalendarServertrunktwextwhotesttest_xmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/test/test_xml.py (10674 => 10675)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/test/test_xml.py 2013-02-11 15:20:35 UTC (rev 10674)
+++ CalendarServer/trunk/twext/who/test/test_xml.py 2013-02-11 18:49:10 UTC (rev 10675)
</span><span class="lines">@@ -280,17 +280,33 @@
</span><span class="cx">
</span><span class="cx"> # Verify change is present immediately
</span><span class="cx"> record = (yield service.recordWithUID("__wsanchez__"))
</span><del>- self.assertEquals(record.fullName, "Wilfredo Sanchez Vega")
</del><ins>+ self.assertEquals(set(record.fullNames), set(("Wilfredo Sanchez Vega",)))
</ins><span class="cx">
</span><span class="cx"> # Verify change is persisted
</span><span class="cx"> service.flush()
</span><span class="cx"> record = (yield service.recordWithUID("__wsanchez__"))
</span><del>- self.assertEquals(record.fullName, "Wilfredo Sanchez Vega")
</del><ins>+ self.assertEquals(set(record.fullNames), set(("Wilfredo Sanchez Vega",)))
</ins><span class="cx">
</span><del>- test_updateRecord.todo = "Not implemented."
</del><span class="cx">
</span><ins>+ @inlineCallbacks
+ def test_addRecord(self):
+ service = self._testService()
</ins><span class="cx">
</span><ins>+ raise NotImplementedError()
</ins><span class="cx">
</span><ins>+ test_addRecord.todo = "Not implemented."
+
+
+ @inlineCallbacks
+ def test_addRecordNo(self):
+ service = self._testService()
+
+ raise NotImplementedError()
+
+ test_addRecord.todo = "Not implemented."
+
+
+
</ins><span class="cx"> class DirectoryRecordTest(BaseTest, test_directory.DirectoryRecordTest):
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def test_members(self):
</span></span></pre></div>
<a id="CalendarServertrunktwextwhoxmlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/xml.py (10674 => 10675)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/xml.py 2013-02-11 15:20:35 UTC (rev 10674)
+++ CalendarServer/trunk/twext/who/xml.py 2013-02-11 18:49:10 UTC (rev 10675)
</span><span class="lines">@@ -29,6 +29,8 @@
</span><span class="cx">
</span><span class="cx"> from xml.etree.ElementTree import parse as parseXML
</span><span class="cx"> from xml.etree.ElementTree import ParseError as XMLParseError
</span><ins>+from xml.etree.ElementTree import tostring as etreeToString
+from xml.etree.ElementTree import Element as XMLElement
</ins><span class="cx">
</span><span class="cx"> from twisted.python.constants import Names, NamedConstant, Values, ValueConstant
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span><span class="lines">@@ -408,10 +410,48 @@
</span><span class="cx"> record = recordsByUID.get(uidNode.text, None)
</span><span class="cx">
</span><span class="cx"> if record:
</span><del>- raise NotImplementedError("Update record: %s" % (record,))
</del><ins>+ recordNode.clear()
</ins><span class="cx">
</span><ins>+ for (name, value) in record.fields.items():
+ if name == self.fieldName.recordType:
+ # FIXME: This lookup of the record type value is a bit much to do in a loop
+ for valueName in self.value.iterconstants():
+ if getattr(valueName, "recordType", None) == value:
+ recordNode.set(self.attribute.recordType.value, valueName.value)
+ break
+ else:
+ raise AssertionError("Unknown record type: %r" % (value,))
+ else:
+ # FIXME: This lookup of the field name element is a bit much to do in a loop
+ for elementName in self.element.iterconstants():
+ if getattr(elementName, "fieldName", None) == name:
+ if self.fieldName.isMultiValue(name):
+ values = value
+ else:
+ values = (value,)
</ins><span class="cx">
</span><ins>+ for value in values:
+ subNode = XMLElement(tag=elementName.value)
+ subNode.text = value
+ recordNode.append(subNode)
</ins><span class="cx">
</span><ins>+ break
+ else:
+ raise AssertionError("Unknown field name: %r" % (name,))
+
+ del recordsByUID[record.uid]
+
+ if recordsByUID:
+ if not create:
+ raise NotImplementedError("Raise something.")
+
+ raise NotImplementedError("Add new records.")
+
+ self.filePath.setContent(etreeToString(directoryNode))
+ self.flush()
+
+
+
</ins><span class="cx"> class DirectoryRecord(BaseDirectoryRecord):
</span><span class="cx"> """
</span><span class="cx"> XML directory record
</span></span></pre>
</div>
</div>
</body>
</html>