<!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>[13085] CalendarServer/branches/users/sagen/move2who-4</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/13085">13085</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 21:08:21 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix structured location test</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4calendarservertoolsgatewaypy">CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/gateway.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestresourcesxml">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavcaldavdatastoresqlpy">CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavcaldavdatastoretestutilpy">CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/test/util.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4calendarservertoolsgatewaypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/gateway.py (13084 => 13085)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/gateway.py 2014-04-01 02:26:24 UTC (rev 13084)
+++ CalendarServer/branches/users/sagen/move2who-4/calendarserver/tools/gateway.py 2014-04-01 04:08:21 UTC (rev 13085)
</span><span class="lines">@@ -287,6 +287,10 @@
</span><span class="cx">
</span><span class="cx"> fields[field] = value
</span><span class="cx">
</span><ins>+ if FieldName.shortNames not in fields:
+ # No short names were provided, so copy from uid
+ fields[FieldName.shortNames] = [fields[FieldName.uid]]
+
</ins><span class="cx"> record = DirectoryRecord(self.dir, fields)
</span><span class="cx"> yield self.dir.updateRecords([record], create=create)
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorytestresourcesxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml (13084 => 13085)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml 2014-04-01 02:26:24 UTC (rev 13084)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/test/resources.xml 2014-04-01 04:08:21 UTC (rev 13085)
</span><span class="lines">@@ -87,5 +87,34 @@
</span><span class="cx"> <password>location01</password>
</span><span class="cx"> <full-name>Room 01</full-name>
</span><span class="cx"> </record>
</span><ins>+ <record type="location">
+ <short-name>room-with-address-1</short-name>
+ <uid>room-addr-1</uid>
+ <guid>634A102B-6902-464F-9451-8A86A31628C1</guid>
+ <password>room-addr-2</password>
+ <full-name>Room with Address 1</full-name>
+ <associatedAddress>1-infinite-loop</associatedAddress>
+ </record>
+ <record type="location">
+ <short-name>room-with-address-2</short-name>
+ <uid>room-addr-2</uid>
+ <password>room-addr-2</password>
+ <full-name>Room with Address 2</full-name>
+ <associatedAddress>2-infinite-loop</associatedAddress>
+ </record>
+ <record type="address">
+ <short-name>il1</short-name>
+ <uid>1-infinite-loop</uid>
+ <full-name>One Infinite Loop</full-name>
+ <streetAddress>1 Infinite Loop, Cupertino, CA 95014</streetAddress>
+ <geographicLocation>37.331741,-122.030333</geographicLocation>
+ </record>
+ <record type="address">
+ <short-name>il2</short-name>
+ <uid>2-infinite-loop</uid>
+ <full-name>Two Infinite Loop</full-name>
+ <streetAddress>2 Infinite Loop, Cupertino, CA 95014</streetAddress>
+ <geographicLocation>37.332633,-122.030502</geographicLocation>
+ </record>
</ins><span class="cx">
</span><span class="cx"> </directory>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavcaldavdatastoresqlpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py (13084 => 13085)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py 2014-04-01 02:26:24 UTC (rev 13084)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py 2014-04-01 04:08:21 UTC (rev 13085)
</span><span class="lines">@@ -2273,15 +2273,16 @@
</span><span class="cx"> X-APPLE-STRUCTURED-LOCATION property and update the LOCATION property
</span><span class="cx"> to contain the name and street address.
</span><span class="cx"> """
</span><ins>+ dir = self.directoryService()
</ins><span class="cx"> for sub in component.subcomponents():
</span><span class="cx"> for attendee in sub.getAllAttendeeProperties():
</span><span class="cx"> if attendee.parameterValue("CUTYPE") == "ROOM":
</span><span class="cx"> value = attendee.value()
</span><del>- loc = yield self.directoryService().recordWithCalendarUserAddress(value)
</del><ins>+ loc = yield dir.recordWithCalendarUserAddress(value)
</ins><span class="cx"> if loc is not None:
</span><span class="cx"> uid = getattr(loc, "associatedAddress", "")
</span><span class="cx"> if uid:
</span><del>- addr = yield self.directoryService().recordWithUID(uid)
</del><ins>+ addr = yield dir.recordWithUID(uid)
</ins><span class="cx"> if addr is not None:
</span><span class="cx"> street = getattr(addr, "streetAddress", "")
</span><span class="cx"> geo = getattr(addr, "geographicLocation", "")
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavcaldavdatastoretestutilpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/test/util.py (13084 => 13085)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/test/util.py 2014-04-01 02:26:24 UTC (rev 13084)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/test/util.py 2014-04-01 04:08:21 UTC (rev 13085)
</span><span class="lines">@@ -63,14 +63,22 @@
</span><span class="cx"> cutype="INDIVIDUAL",
</span><span class="cx"> thisServer=True,
</span><span class="cx"> server=None,
</span><del>- extras={},
</del><ins>+ associatedAddress=None,
+ streetAddress=None,
+ geographicLocation=None
</ins><span class="cx"> ):
</span><span class="cx">
</span><del>- super(TestCalendarStoreDirectoryRecord, self).__init__(uid, shortNames, fullName, thisServer, server, extras=extras)
</del><ins>+ super(TestCalendarStoreDirectoryRecord, self).__init__(
+ uid, shortNames, fullName, thisServer, server,
+ )
</ins><span class="cx"> self.calendarUserAddresses = calendarUserAddresses
</span><span class="cx"> self.cutype = cutype
</span><ins>+ self.associatedAddress = associatedAddress
+ self.streetAddress = streetAddress
+ self.geographicLocation = geographicLocation
</ins><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def canonicalCalendarUserAddress(self):
</span><span class="cx"> """
</span><span class="cx"> Return a CUA for this record, preferring in this order:
</span><span class="lines">@@ -169,31 +177,23 @@
</span><span class="cx"> # Structured Locations
</span><span class="cx"> directory.addRecord(TestCalendarStoreDirectoryRecord(
</span><span class="cx"> "il1", ("il1",), "1 Infinite Loop", [],
</span><del>- extras={
- "geo" : "37.331741,-122.030333",
- "streetAddress" : "1 Infinite Loop, Cupertino, CA 95014",
- }
</del><ins>+ geographicLocation="37.331741,-122.030333",
+ streetAddress="1 Infinite Loop, Cupertino, CA 95014"
</ins><span class="cx"> ))
</span><span class="cx"> directory.addRecord(TestCalendarStoreDirectoryRecord(
</span><span class="cx"> "il2", ("il2",), "2 Infinite Loop", [],
</span><del>- extras={
- "geo" : "37.332633,-122.030502",
- "streetAddress" : "2 Infinite Loop, Cupertino, CA 95014",
- }
</del><ins>+ geographicLocation="37.332633,-122.030502",
+ streetAddress="2 Infinite Loop, Cupertino, CA 95014"
</ins><span class="cx"> ))
</span><span class="cx"> directory.addRecord(TestCalendarStoreDirectoryRecord(
</span><span class="cx"> "room1", ("room1",), "Conference Room One",
</span><span class="cx"> frozenset(("urn:uuid:room1",)),
</span><del>- extras={
- "associatedAddress" : "il1",
- }
</del><ins>+ associatedAddress="il1",
</ins><span class="cx"> ))
</span><span class="cx"> directory.addRecord(TestCalendarStoreDirectoryRecord(
</span><span class="cx"> "room2", ("room2",), "Conference Room Two",
</span><span class="cx"> frozenset(("urn:uuid:room2",)),
</span><del>- extras={
- "associatedAddress" : "il2",
- }
</del><ins>+ associatedAddress="il2",
</ins><span class="cx"> ))
</span><span class="cx">
</span><span class="cx"> return directory
</span></span></pre>
</div>
</div>
</body>
</html>