<!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>[13070] 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/13070">13070</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-31 16:26:45 -0700 (Mon, 31 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix structured locations</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4confauthresourcestestxml">CalendarServer/branches/users/sagen/move2who-4/conf/auth/resources-test.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavcaldavdatastoresqlpy">CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4confauthresourcestestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/resources-test.xml (13069 => 13070)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/resources-test.xml 2014-03-31 22:43:14 UTC (rev 13069)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/resources-test.xml 2014-03-31 23:26:45 UTC (rev 13070)
</span><span class="lines">@@ -3,9 +3,7 @@
</span><span class="cx"> <short-name>fantastic</short-name>
</span><span class="cx"> <uid>4D66A20A-1437-437D-8069-2F14E8322234</uid>
</span><span class="cx"> <full-name>Fantastic Conference Room</full-name>
</span><del>- <extras>
- <associatedAddress>63A2F949-2D8D-4C8D-B8A5-DCF2A94610F3</associatedAddress>
- </extras>
</del><ins>+ <associatedAddress>63A2F949-2D8D-4C8D-B8A5-DCF2A94610F3</associatedAddress>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><span class="cx"> <short-name>jupiter</short-name>
</span><span class="lines">@@ -86,9 +84,7 @@
</span><span class="cx"> <short-name>sharissroom</short-name>
</span><span class="cx"> <uid>80689D41-DAF8-4189-909C-DB017B271892</uid>
</span><span class="cx"> <full-name>Shari's Room</full-name>
</span><del>- <extras>
- <associatedAddress>6F9EE33B-78F6-481B-9289-3D0812FF0D64</associatedAddress>
- </extras>
</del><ins>+ <associatedAddress>6F9EE33B-78F6-481B-9289-3D0812FF0D64</associatedAddress>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><span class="cx"> <short-name>pluto</short-name>
</span><span class="lines">@@ -109,9 +105,7 @@
</span><span class="cx"> <short-name>pretend</short-name>
</span><span class="cx"> <uid>06E3BDCB-9C19-485A-B14E-F146A80ADDC6</uid>
</span><span class="cx"> <full-name>Pretend Conference Room</full-name>
</span><del>- <extras>
- <associatedAddress>76E7ECA6-08BC-4AE7-930D-F2E7453993A5</associatedAddress>
- </extras>
</del><ins>+ <associatedAddress>76E7ECA6-08BC-4AE7-930D-F2E7453993A5</associatedAddress>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="location">
</span><span class="cx"> <short-name>neptune</short-name>
</span><span class="lines">@@ -247,27 +241,21 @@
</span><span class="cx"> <short-name>testaddress1</short-name>
</span><span class="cx"> <uid>6F9EE33B-78F6-481B-9289-3D0812FF0D64</uid>
</span><span class="cx"> <full-name>Test Address One</full-name>
</span><del>- <extras>
- <streetAddress>20300 Stevens Creek Blvd, Cupertino, CA 95014</streetAddress>
- <geo>37.322281,-122.028345</geo>
- </extras>
</del><ins>+ <streetAddress>20300 Stevens Creek Blvd, Cupertino, CA 95014</streetAddress>
+ <geographicLocation>37.322281,-122.028345</geographicLocation>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="address">
</span><span class="cx"> <short-name>il2</short-name>
</span><span class="cx"> <uid>63A2F949-2D8D-4C8D-B8A5-DCF2A94610F3</uid>
</span><span class="cx"> <full-name>IL2</full-name>
</span><del>- <extras>
- <streetAddress>2 Infinite Loop, Cupertino, CA 95014</streetAddress>
- <geo>37.332633,-122.030502</geo>
- </extras>
</del><ins>+ <streetAddress>2 Infinite Loop, Cupertino, CA 95014</streetAddress>
+ <geographicLocation>37.332633,-122.030502</geographicLocation>
</ins><span class="cx"> </record>
</span><span class="cx"> <record type="address">
</span><span class="cx"> <short-name>il1</short-name>
</span><span class="cx"> <uid>76E7ECA6-08BC-4AE7-930D-F2E7453993A5</uid>
</span><span class="cx"> <full-name>IL1</full-name>
</span><del>- <extras>
- <streetAddress>1 Infinite Loop, Cupertino, CA 95014</streetAddress>
- <geo>37.331741,-122.030333</geo>
- </extras>
</del><ins>+ <streetAddress>1 Infinite Loop, Cupertino, CA 95014</streetAddress>
+ <geographicLocation>37.331741,-122.030333</geographicLocation>
</ins><span class="cx"> </record>
</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 (13069 => 13070)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py 2014-03-31 22:43:14 UTC (rev 13069)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/caldav/datastore/sql.py 2014-03-31 23:26:45 UTC (rev 13070)
</span><span class="lines">@@ -2277,30 +2277,28 @@
</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>- # FIXME: this should use recordWithCalendarUserAddress(), right?
- if value.startswith("urn:uuid:"):
- guid = value[9:]
- loc = yield self.directoryService().recordWithGUID(guid)
- if loc is not None:
- uid = getattr(loc, "associatedAddress", "")
- if uid:
- addr = yield self.directoryService().recordWithUID(uid)
- if addr is not None:
- street = getattr(addr, "streetAddress", "")
- geo = getattr(addr, "geographicLocation", "")
- if street and geo:
- title = attendee.parameterValue("CN")
- params = {
- "X-ADDRESS": street,
- "X-APPLE-RADIUS": "71",
- "X-TITLE": title,
- }
- structured = Property("X-APPLE-STRUCTURED-LOCATION",
- "geo:%s" % (geo,), params=params,
- valuetype=Value.VALUETYPE_URI)
- sub.replaceProperty(structured)
- sub.replaceProperty(Property("LOCATION",
- "%s\n%s" % (title, street)))
</del><ins>+ loc = yield self.directoryService().recordWithCalendarUserAddress(value)
+ if loc is not None:
+ uid = getattr(loc, "associatedAddress", "")
+ if uid:
+ addr = yield self.directoryService().recordWithUID(uid)
+ if addr is not None:
+ street = getattr(addr, "streetAddress", "")
+ geo = getattr(addr, "geographicLocation", "")
+ if street and geo:
+ title = attendee.parameterValue("CN")
+ params = {
+ "X-ADDRESS": street,
+ "X-APPLE-RADIUS": "71",
+ "X-TITLE": title,
+ }
+ structured = Property("X-APPLE-STRUCTURED-LOCATION",
+ "geo:%s" % (geo.encode("utf-8"),), params=params,
+ valuetype=Value.VALUETYPE_URI)
+ sub.replaceProperty(structured)
+ newLocProperty = Property("LOCATION",
+ "%s\n%s" % (title, street.encode("utf-8")))
+ sub.replaceProperty(newLocProperty)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span></span></pre>
</div>
</div>
</body>
</html>