<!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>[13171] CalendarServer/trunk</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/13171">13171</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-04-04 16:55:03 -0700 (Fri, 04 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>More directory gateway adjustments</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwistedcaldavdirectorybackedaddressbookpy">CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_addressbook_querypy">CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py</a></li>
<li><a href="#CalendarServertrunktwistedcaldavmethodreport_multiget_commonpy">CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py</a></li>
<li><a href="#CalendarServertrunktxdavwhovcardpy">CalendarServer/trunk/txdav/who/vcard.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwistedcaldavdirectorybackedaddressbookpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py (13170 => 13171)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py        2014-04-04 23:10:03 UTC (rev 13170)
+++ CalendarServer/trunk/twistedcaldav/directorybackedaddressbook.py        2014-04-04 23:55:03 UTC (rev 13171)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><del>-    def doAddressBookDirectoryQuery(self, addressBookFilter, addressBookQuery, maxResults, defaultKind=None):
</del><ins>+    def doAddressBookDirectoryQuery(self, addressBookFilter, addressBookQuery, maxResults, defaultKind=&quot;individual&quot;):
</ins><span class="cx">         &quot;&quot;&quot;
</span><span class="cx">         Get vCards for a given addressBookFilter and addressBookQuery
</span><span class="cx">         &quot;&quot;&quot;
</span><span class="lines">@@ -372,7 +372,6 @@
</span><span class="cx">                     return andOrExpression(allOf, matchList)
</span><span class="cx">                     '''
</span><span class="cx"> 
</span><del>-
</del><span class="cx">             def andOrExpression(propFilterAllOf, matchList):
</span><span class="cx">                 matchList = list(set(matchList))
</span><span class="cx">                 if propFilterAllOf and len(matchList) &gt; 1:
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_addressbook_querypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py (13170 => 13171)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py        2014-04-04 23:10:03 UTC (rev 13170)
+++ CalendarServer/trunk/twistedcaldav/method/report_addressbook_query.py        2014-04-04 23:55:03 UTC (rev 13171)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx">         def queryDirectoryBackedAddressBook(directoryBackedAddressBook, addressBookFilter):
</span><span class="cx">             &quot;&quot;&quot;
</span><span class="cx">             &quot;&quot;&quot;
</span><del>-            results, limited[0] = yield directoryBackedAddressBook.doAddressBookDirectoryQuery(addressBookFilter, query, max_number_of_results[0], defaultKind=&quot;individual&quot;)
</del><ins>+            results, limited[0] = yield directoryBackedAddressBook.doAddressBookDirectoryQuery(addressBookFilter, query, max_number_of_results[0])
</ins><span class="cx">             for vCardResult in results:
</span><span class="cx"> 
</span><span class="cx">                 # match against original filter if different from addressBookFilter
</span></span></pre></div>
<a id="CalendarServertrunktwistedcaldavmethodreport_multiget_commonpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py (13170 => 13171)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py        2014-04-04 23:10:03 UTC (rev 13170)
+++ CalendarServer/trunk/twistedcaldav/method/report_multiget_common.py        2014-04-04 23:55:03 UTC (rev 13171)
</span><span class="lines">@@ -267,7 +267,7 @@
</span><span class="cx"> 
</span><span class="cx">                 #get vCards and filter
</span><span class="cx">                 limit = config.DirectoryAddressBook.MaxQueryResults
</span><del>-                results, limited = (yield self.doAddressBookDirectoryQuery(addressBookFilter, propertyreq, limit))
</del><ins>+                results, limited = (yield self.doAddressBookDirectoryQuery(addressBookFilter, propertyreq, limit, defaultKind=None))
</ins><span class="cx">                 if limited:
</span><span class="cx">                     log.error(&quot;Too many results in multiget report: {count}&quot;, count=len(resources))
</span><span class="cx">                     raise HTTPError(ErrorResponse(
</span></span></pre></div>
<a id="CalendarServertrunktxdavwhovcardpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/txdav/who/vcard.py (13170 => 13171)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/txdav/who/vcard.py        2014-04-04 23:10:03 UTC (rev 13170)
+++ CalendarServer/trunk/txdav/who/vcard.py        2014-04-04 23:55:03 UTC (rev 13171)
</span><span class="lines">@@ -55,7 +55,8 @@
</span><span class="cx"> # all possible generated parameters.
</span><span class="cx"> vCardPropToParamMap = {
</span><span class="cx">     #&quot;PHOTO&quot;: {&quot;ENCODING&quot;: (&quot;B&quot;,), &quot;TYPE&quot;: (&quot;JPEG&quot;,), },
</span><del>-    &quot;ADR&quot;: {&quot;TYPE&quot;: (&quot;WORK&quot;, &quot;PREF&quot;, &quot;POSTAL&quot;, &quot;PARCEL&quot;,), },
</del><ins>+    &quot;ADR&quot;: {&quot;TYPE&quot;: (&quot;WORK&quot;, &quot;PREF&quot;, &quot;POSTAL&quot;, &quot;PARCEL&quot;,),
+            &quot;LABEL&quot;: None, &quot;GEO&quot;: None, },
</ins><span class="cx">     #&quot;LABEL&quot;: {&quot;TYPE&quot;: (&quot;POSTAL&quot;, &quot;PARCEL&quot;,)},
</span><span class="cx">     #&quot;TEL&quot;: {&quot;TYPE&quot;: None, },  # None means param can contain can be anything
</span><span class="cx">     &quot;EMAIL&quot;: {&quot;TYPE&quot;: None, },
</span><span class="lines">@@ -188,17 +189,29 @@
</span><span class="cx">     # 3.2 Delivery Addressing Types http://tools.ietf.org/html/rfc2426#section-3.2
</span><span class="cx">     #===========================================================================
</span><span class="cx">     # 3.2.1 ADR
</span><ins>+    #
+    # Experimental:
+    #     Use vCard 4.0 ADR: http://tools.ietf.org/html/rfc6350#section-6.3.1
+    params = {}
+    geo = record.fields.get(CalFieldName.geographicLocation)
+    if geo:
+        params[&quot;GEO&quot;] = geo.encode(&quot;utf-8&quot;)
+    label = record.fields.get(CalFieldName.streetAddress)
+    if label:
+        params[&quot;LABEL&quot;] = label.encode(&quot;utf-8&quot;)
</ins><span class="cx"> 
</span><ins>+    #
</ins><span class="cx">     extended = record.fields.get(CalFieldName.floor)
</span><span class="cx"> 
</span><del>-    #TODO: parse !
</del><ins>+    # TODO: Parse?
</ins><span class="cx">     street = record.fields.get(CalFieldName.streetAddress)
</span><span class="cx">     city = None
</span><span class="cx">     region = None
</span><span class="cx">     postalcode = None
</span><span class="cx">     country = None
</span><span class="cx"> 
</span><del>-    if extended or street or city or region or postalcode or country:
</del><ins>+    if extended or street or city or region or postalcode or country or params:
+        params[&quot;TYPE&quot;] = (&quot;WORK&quot;, &quot;PREF&quot;, &quot;POSTAL&quot;, &quot;PARCEL&quot;,)
</ins><span class="cx">         vcard.addProperty(
</span><span class="cx">             Property(
</span><span class="cx">                 &quot;ADR&quot;, Adr(
</span><span class="lines">@@ -210,7 +223,7 @@
</span><span class="cx">                     postalcode=postalcode.encode(&quot;utf-8&quot;) if postalcode else None,
</span><span class="cx">                     country=country.encode(&quot;utf-8&quot;) if country else None,
</span><span class="cx">                 ),
</span><del>-                params={&quot;TYPE&quot;: (&quot;WORK&quot;, &quot;PREF&quot;, &quot;POSTAL&quot;, &quot;PARCEL&quot;,), }
</del><ins>+                params=params
</ins><span class="cx">             )
</span><span class="cx">         )
</span><span class="cx"> 
</span><span class="lines">@@ -308,7 +321,8 @@
</span><span class="cx">     # add members
</span><span class="cx">     # FIXME:  members() is a deferred, so all of vCardFromRecord is deferred.
</span><span class="cx">     for memberRecord in (yield record.members()):
</span><del>-        vcard.addProperty(Property(&quot;X-ADDRESSBOOKSERVER-MEMBER&quot;, &quot;urn:uuid:&quot; + memberRecord.fields[FieldName.uid].encode(&quot;utf-8&quot;)))
</del><ins>+        if memberRecord:
+            vcard.addProperty(Property(&quot;X-ADDRESSBOOKSERVER-MEMBER&quot;, &quot;urn:uuid:&quot; + memberRecord.fields[FieldName.uid].encode(&quot;utf-8&quot;)))
</ins><span class="cx"> 
</span><span class="cx">     #===================================================================
</span><span class="cx">     # vCard 4.0  http://tools.ietf.org/html/rfc6350
</span></span></pre>
</div>
</div>

</body>
</html>