<!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>[13133] CalendarServer/branches/users/sagen</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/13133">13133</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-04-02 15:13:14 -0700 (Wed, 02 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>enable CDT <feature>directory-gateway</feature> and get gateway tests working with new GUIDs. More fixes in server directory-gateway code.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorybackedaddressbookpy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directorybackedaddressbook.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhovcardpy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/vcard.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2whocdtResourceCardDAVvreportssearchquery16xml">CalendarServer/branches/users/sagen/move2who-cdt/Resource/CardDAV/vreports/searchquery/16.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2whocdtscriptsserverserverinfoxml">CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2whocdtscriptstestsCardDAVreportsxml">CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/reports.xml</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li>CalendarServer/branches/users/sagen/move2who-4/calendarserver/platform/darwin/od/</li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorybackedaddressbookpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directorybackedaddressbook.py (13132 => 13133)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directorybackedaddressbook.py        2014-04-02 21:27:52 UTC (rev 13132)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directorybackedaddressbook.py        2014-04-02 22:13:14 UTC (rev 13133)
</span><span class="lines">@@ -37,8 +37,8 @@
</span><span class="cx"> from txdav.carddav.datastore.query.filter import IsNotDefined, TextMatch, \
</span><span class="cx"> ParameterFilter
</span><span class="cx"> from txdav.who.idirectory import FieldName as CalFieldName
</span><del>-from txdav.who.vcard import vCardKindToRecordTypeMap, vCardPropToParamMap, \
- vCardConstantProperties, vCardFromRecord
</del><ins>+from txdav.who.vcard import vCardKindToRecordTypeMap, recordTypeToVCardKindMap, \
+ vCardPropToParamMap, vCardConstantProperties, vCardFromRecord
</ins><span class="cx"> from txdav.xml import element as davxml
</span><span class="cx"> from txdav.xml.base import twisted_dav_namespace, dav_namespace, parse_date, \
</span><span class="cx"> twisted_private_namespace
</span><span class="lines">@@ -200,10 +200,11 @@
</span><span class="cx"> Operand.AND
</span><span class="cx"> )
</span><span class="cx"> elif expression is True: # True means all records
</span><ins>+ allowedRecordTypes = set(self.directory.recordTypes()) & set(recordTypeToVCardKindMap.keys())
</ins><span class="cx"> expression = CompoundExpression(
</span><span class="cx"> [
</span><span class="cx"> MatchExpression(FieldName.recordType, recordType, MatchType.equals)
</span><del>- for recordType in self.directory.recordTypes()
</del><ins>+ for recordType in allowedRecordTypes
</ins><span class="cx"> ], Operand.OR
</span><span class="cx"> )
</span><span class="cx">
</span><span class="lines">@@ -344,32 +345,32 @@
</span><span class="cx"> # special case recordType field
</span><span class="cx"> if fieldName == FieldName.recordType:
</span><span class="cx"> # change kind to record type
</span><del>- uMatchString = vCardKindToRecordTypeMap.get(matchString)
- if uMatchString is None:
- uMatchString = NamedConstant()
- uMatchString.description = u""
</del><ins>+ matchValue = vCardKindToRecordTypeMap.get(matchString.lower())
+ if matchValue is None:
+ matchValue = NamedConstant()
+ matchValue.description = u""
</ins><span class="cx">
</span><span class="cx"> # change types and flags
</span><span class="cx"> matchFlags &= ~MatchFlags.caseInsensitive
</span><span class="cx"> matchType = MatchType.equals
</span><del>- elif fieldName == FieldName.uid:
- # special case uid until I figure out how to do a case-sens collation
- matchFlags &= ~MatchFlags.caseInsensitive
- uMatchString = matchString.decode("utf-8")
</del><span class="cx"> else:
</span><del>- uMatchString = matchString.decode("utf-8")
</del><ins>+ matchValue = matchString.decode("utf-8")
</ins><span class="cx">
</span><del>- return MatchExpression(fieldName, uMatchString, matchType, matchFlags)
</del><ins>+ return MatchExpression(fieldName, matchValue, matchType, matchFlags)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def definedExpression(defined, allOf):
</span><span class="cx"> if constant or propFilter.filter_name in ("N" , "FN", "UID", "SOURCE", "KIND",):
</span><span class="cx"> return defined # all records have this property so no records do not have it
</span><span class="cx"> else:
</span><ins>+ # FIXME: The startsWith expression below, which works with LDAP and OD. is not currently supported
+ return True
+ '''
</ins><span class="cx"> # this may generate inefficient LDAP query string
</span><span class="cx"> matchFlags = MatchFlags_none if defined else MatchFlags.NOT
</span><span class="cx"> matchList = [matchExpression(fieldName, "", MatchType.startsWith, matchFlags) for fieldName in searchableFields]
</span><span class="cx"> return andOrExpression(allOf, matchList)
</span><ins>+ '''
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def andOrExpression(propFilterAllOf, matchList):
</span><span class="lines">@@ -472,7 +473,7 @@
</span><span class="cx"> else:
</span><span class="cx"> matchFlags = MatchFlags_none
</span><span class="cx">
</span><del>- matchList = [matchExpression(fieldName, matchString.decode("utf-8"), matchType, matchFlags) for fieldName in searchableFields]
</del><ins>+ matchList = [matchExpression(fieldName, matchString, matchType, matchFlags) for fieldName in searchableFields]
</ins><span class="cx"> matchList.extend(matchList)
</span><span class="cx"> return andOrExpression(propFilterAllOf, matchList)
</span><span class="cx">
</span><span class="lines">@@ -595,8 +596,8 @@
</span><span class="cx"> '''
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def generate(self, record, kind=None, addProps=None,):
- self._vCard = yield vCardFromRecord(record, kind, addProps, None)
</del><ins>+ def generate(self, record, forceKind=None, addProps=None,):
+ self._vCard = yield vCardFromRecord(record, forceKind, addProps, None)
</ins><span class="cx"> returnValue(self)
</span><span class="cx">
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhovcardpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/vcard.py (13132 => 13133)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/vcard.py        2014-04-02 21:27:52 UTC (rev 13132)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/vcard.py        2014-04-02 22:13:14 UTC (rev 13133)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>-def vCardFromRecord(record, kind=None, addProps=None, parentURI=None):
</del><ins>+def vCardFromRecord(record, forceKind=None, addProps=None, parentURI=None):
</ins><span class="cx">
</span><span class="cx"> def isUniqueProperty(newProperty, ignoredParameters={}):
</span><span class="cx"> existingProperties = vcard.properties(newProperty.name())
</span><span class="lines">@@ -110,11 +110,13 @@
</span><span class="cx"> # start
</span><span class="cx"> #=======================================================================
</span><span class="cx">
</span><del>- log.debug("vCardFromRecord: record={record}, kind={kind}, addProps={addProps}, parentURI={parentURI}",
- record=record, kind=kind, addProps=addProps, parentURI=parentURI)
</del><ins>+ log.debug("vCardFromRecord: record={record}, forceKind={forceKind}, addProps={addProps}, parentURI={parentURI}",
+ record=record, forceKind=forceKind, addProps=addProps, parentURI=parentURI)
</ins><span class="cx">
</span><del>- if kind is None:
</del><ins>+ if forceKind is None:
</ins><span class="cx"> kind = recordTypeToVCardKindMap.get(record.recordType, "individual")
</span><ins>+ else:
+ kind = forceKind
</ins><span class="cx">
</span><span class="cx"> constantProperties = vCardConstantProperties.copy()
</span><span class="cx"> if addProps:
</span><span class="lines">@@ -239,8 +241,12 @@
</span><span class="cx"> #
</span><span class="cx"> # UNIMPLEMENTED:
</span><span class="cx"> # 3.4.1 TZ
</span><del>- # 3.4.2 GEO
</del><span class="cx"> #
</span><ins>+ # 3.4.2 GEO
+ geographicLocation = record.fields.get(CalFieldName.geographicLocation)
+ if geographicLocation:
+ vcard.addProperty(Property("GEO", geographicLocation.encode("utf-8")))
+
</ins><span class="cx"> #===================================================================
</span><span class="cx"> # 3.5 ORGANIZATIONAL TYPES http://tools.ietf.org/html/rfc2426#section-3.5
</span><span class="cx"> #===================================================================
</span><span class="lines">@@ -295,12 +301,6 @@
</span><span class="cx"> # X-PHONETIC-LAST-NAME
</span><span class="cx"> # X-ABRELATEDNAMES
</span><span class="cx">
</span><del>- # X-GEOLOCATION
- # TODO: Just made this up. Check for standard. Perhaps GEO can be pulled out
- geographicLocation = record.fields.get(CalFieldName.geographicLocation)
- if geographicLocation:
- vcard.addProperty(Property("X-GEOLOCATION", geographicLocation.encode("utf-8")))
-
</del><span class="cx"> # X-ADDRESSBOOKSERVER-KIND
</span><span class="cx"> if kind == "group":
</span><span class="cx"> vcard.addProperty(Property("X-ADDRESSBOOKSERVER-KIND", kind))
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2whocdtResourceCardDAVvreportssearchquery16xml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-cdt/Resource/CardDAV/vreports/searchquery/16.xml (13132 => 13133)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-cdt/Resource/CardDAV/vreports/searchquery/16.xml        2014-04-02 21:27:52 UTC (rev 13132)
+++ CalendarServer/branches/users/sagen/move2who-cdt/Resource/CardDAV/vreports/searchquery/16.xml        2014-04-02 22:13:14 UTC (rev 13133)
</span><span class="lines">@@ -13,7 +13,7 @@
</span><span class="cx"> <C:prop-filter name="X-ADDRESSBOOKSERVER-MEMBER">
</span><span class="cx"> <C:text-match collation="i;unicode-casemap"
</span><span class="cx"> match-type="contains"
</span><del>- >group</C:text-match>
</del><ins>+ >$groupguid3:</C:text-match>
</ins><span class="cx"> </C:prop-filter>
</span><span class="cx"> </C:filter>
</span><span class="cx"> </C:addressbook-query>
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2whocdtscriptsserverserverinfoxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml (13132 => 13133)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml        2014-04-02 21:27:52 UTC (rev 13132)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/server/serverinfo.xml        2014-04-02 22:13:14 UTC (rev 13133)
</span><span class="lines">@@ -109,7 +109,7 @@
</span><span class="cx">                 <feature>carddav</feature>                                                 <!-- Basic CardDAV feature enabler -->
</span><span class="cx">                 <feature>default-addressbook</feature>                         <!-- Default address book behavior -->
</span><span class="cx">                 <feature>shared-addressbooks</feature>                        <!-- Shared address books extension -->
</span><del>-                <!-- <feature>directory-gateway</feature> -->        <!-- Directory gateway extension -->
</del><ins>+                <feature>directory-gateway</feature>                        <!-- Directory gateway extension -->
</ins><span class="cx">
</span><span class="cx">         </features>
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2whocdtscriptstestsCardDAVreportsxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/reports.xml (13132 => 13133)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/reports.xml        2014-04-02 21:27:52 UTC (rev 13132)
+++ CalendarServer/branches/users/sagen/move2who-cdt/scripts/tests/CardDAV/reports.xml        2014-04-02 22:13:14 UTC (rev 13133)
</span><span class="lines">@@ -1326,16 +1326,28 @@
</span><span class="cx">                                                 <value>$groupguid4:.vcf</value>
</span><span class="cx">                                                 <value>$groupguid5:.vcf</value>
</span><span class="cx">                                                 <value>$groupguid6:.vcf</value>
</span><ins>+                                                <value>$groupguid7:.vcf</value>
+                                                <value>$groupguid8:.vcf</value>
+                                                <value>$groupguid9:.vcf</value>
+                                                <value>$groupguid10:.vcf</value>
+                                                <value>$groupguid20:.vcf</value>
+                                                <value>$groupguid30:.vcf</value>
+                                                <value>$groupguid40:.vcf</value>
+                                                <value>$groupguid50:.vcf</value>
+                                                <value>$groupguid60:.vcf</value>
+                                                <value>$groupguid70:.vcf</value>
+                                                <value>$groupguid80:.vcf</value>
+                                                <value>$groupguid90:.vcf</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>totalcount</name>
</span><del>-                                                <value>7</value>
</del><ins>+                                                <value>19</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span><span class="cx">                 </test>
</span><span class="cx">                 <test name="16" ignore="no">
</span><del>-                        <description>query for resources with (KIND equal "group") and (X-ADDRESSBOOKSERVER-MEMBER contains "group"), no eTag, no props " </description>
</del><ins>+                        <description>query for resources with (KIND equal "group") and (X-ADDRESSBOOKSERVER-MEMBER contains $groupguid3:), no eTag, no props " </description>
</ins><span class="cx">                         <request print-response="no">
</span><span class="cx">                                 <method>REPORT</method>
</span><span class="cx">                                 <ruri>$directory:</ruri>
</span><span class="lines">@@ -1348,11 +1360,10 @@
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>okhrefs</name>
</span><span class="cx">                                                 <value>$groupguid4:.vcf</value>
</span><del>-                                                <value>$groupguid5:.vcf</value>
</del><span class="cx">                                         </arg>
</span><span class="cx">                                         <arg>
</span><span class="cx">                                                 <name>totalcount</name>
</span><del>-                                                <value>2</value>
</del><ins>+                                                <value>1</value>
</ins><span class="cx">                                         </arg>
</span><span class="cx">                                 </verify>
</span><span class="cx">                         </request>
</span></span></pre>
</div>
</div>
</body>
</html>