<!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>[13053] 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/13053">13053</a></dd>
<dt>Author</dt> <dd>gaya@apple.com</dd>
<dt>Date</dt> <dd>2014-03-30 16:06:13 -0700 (Sun, 30 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>all CDT tests work but one</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4confauthaccountstestxml">CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorybackedaddressbookpy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directorybackedaddressbook.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavmethodreport_addressbook_querypy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_addressbook_query.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavcarddavdatastorequeryfilterpy">CalendarServer/branches/users/sagen/move2who-4/txdav/carddav/datastore/query/filter.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhovcardpy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/vcard.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4confauthaccountstestxml"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml (13052 => 13053)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml 2014-03-30 15:10:20 UTC (rev 13052)
+++ CalendarServer/branches/users/sagen/move2who-4/conf/auth/accounts-test.xml 2014-03-30 23:06:13 UTC (rev 13053)
</span><span class="lines">@@ -295,6 +295,7 @@
</span><span class="cx"> <uid>public01</uid>
</span><span class="cx"> <password>public01</password>
</span><span class="cx"> <full-name>Public 01</full-name>
</span><ins>+ <email>public01@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="lines">@@ -302,6 +303,7 @@
</span><span class="cx"> <uid>public02</uid>
</span><span class="cx"> <password>public02</password>
</span><span class="cx"> <full-name>Public 02</full-name>
</span><ins>+ <email>public02@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="lines">@@ -309,6 +311,7 @@
</span><span class="cx"> <uid>public03</uid>
</span><span class="cx"> <password>public03</password>
</span><span class="cx"> <full-name>Public 03</full-name>
</span><ins>+ <email>public03@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="lines">@@ -316,6 +319,7 @@
</span><span class="cx"> <uid>public04</uid>
</span><span class="cx"> <password>public04</password>
</span><span class="cx"> <full-name>Public 04</full-name>
</span><ins>+ <email>public04@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="lines">@@ -323,6 +327,7 @@
</span><span class="cx"> <uid>public05</uid>
</span><span class="cx"> <password>public05</password>
</span><span class="cx"> <full-name>Public 05</full-name>
</span><ins>+ <email>public05@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="lines">@@ -330,6 +335,7 @@
</span><span class="cx"> <uid>public06</uid>
</span><span class="cx"> <password>public06</password>
</span><span class="cx"> <full-name>Public 06</full-name>
</span><ins>+ <email>public06@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="lines">@@ -337,6 +343,7 @@
</span><span class="cx"> <uid>public07</uid>
</span><span class="cx"> <password>public07</password>
</span><span class="cx"> <full-name>Public 07</full-name>
</span><ins>+ <email>public07@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="lines">@@ -344,6 +351,7 @@
</span><span class="cx"> <uid>public08</uid>
</span><span class="cx"> <password>public08</password>
</span><span class="cx"> <full-name>Public 08</full-name>
</span><ins>+ <email>public08@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="lines">@@ -351,6 +359,7 @@
</span><span class="cx"> <uid>public09</uid>
</span><span class="cx"> <password>public09</password>
</span><span class="cx"> <full-name>Public 09</full-name>
</span><ins>+ <email>public09@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="user">
</span><span class="lines">@@ -358,6 +367,7 @@
</span><span class="cx"> <uid>public10</uid>
</span><span class="cx"> <password>public10</password>
</span><span class="cx"> <full-name>Public 10</full-name>
</span><ins>+ <email>public10@example.com</email>
</ins><span class="cx"> </record>
</span><span class="cx">
</span><span class="cx"> <record type="group">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectorybackedaddressbookpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directorybackedaddressbook.py (13052 => 13053)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directorybackedaddressbook.py 2014-03-30 15:10:20 UTC (rev 13052)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directorybackedaddressbook.py 2014-03-30 23:06:13 UTC (rev 13053)
</span><span class="lines">@@ -26,7 +26,7 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.who.expression import Operand, MatchType, MatchFlags, \
</span><span class="cx"> MatchExpression, CompoundExpression
</span><del>-from twext.who.idirectory import FieldName, RecordType
</del><ins>+from twext.who.idirectory import FieldName
</ins><span class="cx"> from twisted.internet.defer import deferredGenerator
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, maybeDeferred, \
</span><span class="cx"> returnValue
</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 recordTypeToVCardKindMap, vCardPropToParamMap, \
- vCardConstantProperties, vCardFromRecord
</del><ins>+from txdav.who.vcard import recordTypeToVCardKindMap, vCardKindToRecordTypeMap, \
+ 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">@@ -70,6 +70,8 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def makeChild(self, name):
</span><ins>+ from twistedcaldav.simpleresource import SimpleCalDAVResource
+ return SimpleCalDAVResource(principalCollections=self.principalCollections())
</ins><span class="cx"> return self.directory
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -154,7 +156,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> @inlineCallbacks
</span><del>- def doAddressBookDirectoryQuery(self, addressBookFilter, addressBookQuery, maxResults):
</del><ins>+ def doAddressBookDirectoryQuery(self, addressBookFilter, addressBookQuery, maxResults, defaultKind=None):
</ins><span class="cx"> """
</span><span class="cx"> Get vCards for a given addressBookFilter and addressBookQuery
</span><span class="cx"> """
</span><span class="lines">@@ -165,46 +167,42 @@
</span><span class="cx"> limited = False
</span><span class="cx"> maxQueryRecords = 0
</span><span class="cx">
</span><del>- searchableFields = {
- RecordType.user: {
- "FN": FieldName.fullNames,
- "N": FieldName.fullNames,
- "EMAIL": FieldName.emailAddresses,
- "UID": FieldName.uid,
- "ADR": (
- CalFieldName.streetAddress,
- CalFieldName.floor,
- )
- },
- RecordType.group: {
- "FN": FieldName.fullNames,
- "N": FieldName.fullNames,
- "EMAIL": FieldName.emailAddresses,
- "UID": FieldName.uid,
- "ADR": (
- CalFieldName.streetAddress,
- CalFieldName.floor,
- )
- # LATER "X-ADDRESSBOOKSERVER-MEMBER": FieldName.membersUIDs,
- },
</del><ins>+ vcardPropToRecordFieldMap = {
+ "FN": FieldName.fullNames,
+ "N": FieldName.fullNames,
+ "EMAIL": FieldName.emailAddresses,
+ "UID": FieldName.uid,
+ "ADR": (
+ CalFieldName.streetAddress,
+ CalFieldName.floor,
+ ),
+ "KIND": FieldName.recordType,
+ # LATER "X-ADDRESSBOOKSERVER-MEMBER": FieldName.membersUIDs,
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- allowedRecordTypes = set(self.directory.recordTypes()) & set(recordTypeToVCardKindMap.keys()) & set(searchableFields.keys())
</del><ins>+ allowedRecordTypes = set(self.directory.recordTypes()) & set(recordTypeToVCardKindMap.keys())
</ins><span class="cx"> log.debug("doAddressBookDirectoryQuery: allowedRecordTypes={allowedRecordTypes}", allowedRecordTypes=allowedRecordTypes,)
</span><span class="cx">
</span><ins>+ '''
</ins><span class="cx"> expressions = []
</span><span class="cx"> for recordType in allowedRecordTypes:
</span><span class="cx">
</span><span class="cx"> #log.debug("doAddressBookDirectoryQuery: recordType={recordType}", recordType=recordType,)
</span><span class="cx">
</span><del>- vcardPropToRecordFieldMap = searchableFields[recordType]
</del><span class="cx"> kind = recordTypeToVCardKindMap[recordType]
</span><span class="cx"> constantProperties = vCardConstantProperties.copy()
</span><span class="cx"> constantProperties["KIND"] = kind
</span><span class="cx"> # add KIND as constant so that query can be skipped if addressBookFilter needs a different kind
</span><span class="cx">
</span><del>- propNames, expression = expressionFromABFilter(addressBookFilter, vcardPropToRecordFieldMap, recordType=recordType, constantProperties=constantProperties)
</del><ins>+ propNames, expression = expressionFromABFilter(addressBookFilter, vcardPropToRecordFieldMap, constantProperties=constantProperties)
</ins><span class="cx"> #log.debug("doAddressBookDirectoryQuery: recordType={recordType}, expression={expression!r}, propNames={propNames}", recordType=recordType, expression=expression, propNames=propNames)
</span><ins>+ if expression:
+ recordTypeExpression = MatchExpression(FieldName.recordType, recordType, MatchType.equals)
+ if expression is True:
+ expression = recordTypeExpression
+ else:
+ expression = CompoundExpression((expression, recordTypeExpression,), Operand.AND)
+
</ins><span class="cx"> if expression:
</span><span class="cx"> expressions.append(expression)
</span><span class="cx">
</span><span class="lines">@@ -213,7 +211,35 @@
</span><span class="cx"> expression = CompoundExpression(expressions, Operand.OR)
</span><span class="cx"> else:
</span><span class="cx"> expression = expressions[0]
</span><ins>+ '''
</ins><span class="cx">
</span><ins>+ propNames, expression = expressionFromABFilter(
+ addressBookFilter, vcardPropToRecordFieldMap, vCardConstantProperties
+ )
+
+ if expression:
+ if defaultKind and "KIND" not in propNames:
+ defaultRecordExpression = MatchExpression(
+ FieldName.recordType,
+ vCardKindToRecordTypeMap[defaultKind],
+ MatchType.equals
+ )
+ if expression is True:
+ expression = defaultRecordExpression
+ else:
+ expression = CompoundExpression(
+ (expression, defaultRecordExpression,),
+ Operand.AND
+ )
+ elif expression is True: # True means all records
+ expression = CompoundExpression(
+ [
+ MatchExpression(FieldName.recordType, recordType, MatchType.equals)
+ for recordType in self.directory.recordTypes()
+ ], Operand.OR
+ )
+
+ log.debug("doAddressBookDirectoryQuery: expression={expression!r}, propNames={propNames}", expression=expression, propNames=propNames)
</ins><span class="cx"> maxRecords = int(maxResults * 1.2)
</span><span class="cx">
</span><span class="cx"> # keep trying query till we get results based on filter. Especially when doing "all results" query
</span><span class="lines">@@ -225,7 +251,7 @@
</span><span class="cx"> log.debug("doAddressBookDirectoryQuery: #records={n}, records={records!r}", n=len(records), records=records)
</span><span class="cx"> queryLimited = False
</span><span class="cx">
</span><del>- vCardsResults = [ABDirectoryQueryResult(self, record) for record in records]
</del><ins>+ vCardsResults = [(yield ABDirectoryQueryResult(self).generate(record)) for record in records]
</ins><span class="cx">
</span><span class="cx"> filteredResults = []
</span><span class="cx"> for vCardResult in vCardsResults:
</span><span class="lines">@@ -286,7 +312,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><del>-def expressionFromABFilter(addressBookFilter, vcardPropToSearchableFieldMap, recordType, constantProperties={}):
</del><ins>+def expressionFromABFilter(addressBookFilter, vcardPropToSearchableFieldMap, constantProperties={}):
</ins><span class="cx"> """
</span><span class="cx"> Convert the supplied addressbook-query into a ds expression tree.
</span><span class="cx">
</span><span class="lines">@@ -347,17 +373,34 @@
</span><span class="cx"> @return: (filterProperyNames, expressions) tuple. expression==True means list all results, expression==False means no results
</span><span class="cx"> """
</span><span class="cx">
</span><ins>+ def matchExpression(fieldName, matchString, matchType, matchFlags):
+ # special case recordType field
+ if fieldName == FieldName.recordType:
+ # change kind to record type
+ uMatchString = vCardKindToRecordTypeMap.get(matchString)
+ if uMatchString is None:
+ uMatchString = NamedConstant()
+ uMatchString.description = u""
+
+ # change types and flags
+ matchFlags &= ~MatchFlags.caseInsensitive
+ matchType = MatchType.equals
+ else:
+ uMatchString = matchString.decode("utf-8")
+
+ return MatchExpression(fieldName, uMatchString, matchType, matchFlags)
+
+
</ins><span class="cx"> def definedExpression(defined, allOf):
</span><del>- if constant or propFilter.filter_name in ("N" , "FN", "UID", "SOURCE",):
</del><ins>+ if constant or propFilter.filter_name in ("N" , "FN", "UID", "SOURCE", "KIND",):
</ins><span class="cx"> return defined # all records have this property so no records do not have it
</span><span class="cx"> else:
</span><del>- if defined:
- matchList = [MatchExpression(fieldName, u"", MatchType.startsWith) for fieldName in searchableFields]
- else:
- # this may generate inefficient LDAP query stirng
- matchList = [MatchExpression(fieldName, u"", MatchType.startsWith, MatchFlags.NOT) for fieldName in searchableFields]
</del><ins>+ # this may generate inefficient LDAP query string
+ matchFlags = MatchFlags.NOT & MatchFlags.caseInsensitive if defined else MatchFlags.NOT
+ matchList = [matchExpression(fieldName, "", MatchType.startsWith, matchFlags) for fieldName in searchableFields]
</ins><span class="cx"> return andOrExpression(allOf, matchList)
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> def andOrExpression(propFilterAllOf, matchList):
</span><span class="cx"> matchList = list(set(matchList))
</span><span class="cx"> if propFilterAllOf and len(matchList) > 1:
</span><span class="lines">@@ -448,10 +491,17 @@
</span><span class="cx">
</span><span class="cx"> matchList = []
</span><span class="cx"> for matchString in matchStrings:
</span><del>- if textMatchElement.negate:
- matchList = [MatchExpression(fieldName, matchString.decode("utf-8"), matchType, MatchFlags.NOT) for fieldName in searchableFields]
</del><ins>+ matchFlags = None
+ if textMatchElement.collation == "i;unicode-casemap" and textMatchElement.negate:
+ matchFlags = MatchFlags.caseInsensitive | MatchFlags.NOT
+ elif textMatchElement.collation == "i;unicode-casemap":
+ matchFlags = MatchFlags.caseInsensitive
+ elif textMatchElement.negate:
+ matchFlags = MatchFlags.NOT
</ins><span class="cx"> else:
</span><del>- matchList = [MatchExpression(fieldName, matchString.decode("utf-8"), matchType) for fieldName in searchableFields]
</del><ins>+ matchFlags = MatchFlags.NOT & MatchFlags.caseInsensitive # MatchFlags.none
+
+ matchList = [matchExpression(fieldName, matchString.decode("utf-8"), 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">@@ -541,14 +591,6 @@
</span><span class="cx"> else:
</span><span class="cx"> expression = not filterAllOf
</span><span class="cx">
</span><del>- #log.debug("expressionFromABFilter: recordType={rdn!r}, expression={q!r}, properties={pn}", rdn=recordType, q=expression, pn=properties)
- if expression:
- recordTypeExpression = MatchExpression(FieldName.recordType, recordType, MatchType.equals)
- if expression is True:
- expression = recordTypeExpression
- else:
- expression = CompoundExpression((expression, recordTypeExpression,), Operand.AND)
-
</del><span class="cx"> #log.debug("expressionFromABFilter: expression={q!r}, properties={pn}", q=expression, pn=properties)
</span><span class="cx"> return((properties, expression))
</span><span class="cx">
</span><span class="lines">@@ -559,14 +601,10 @@
</span><span class="cx"> Result from ab query report or multiget on directory
</span><span class="cx"> """
</span><span class="cx">
</span><del>- def __init__(self, directoryBackedAddressBook, record,
- kind=None,
- addProps=None,
- ):
</del><ins>+ def __init__(self, directoryBackedAddressBook,):
</ins><span class="cx">
</span><span class="cx"> self._directoryBackedAddressBook = directoryBackedAddressBook
</span><del>- #generate a vCard here. May throw an exception
- self._vCard = vCardFromRecord(record, kind, addProps, directoryBackedAddressBook.uri)
</del><ins>+ #self._vCard = None
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def __repr__(self):
</span><span class="lines">@@ -585,12 +623,18 @@
</span><span class="cx"> return hash(s)
</span><span class="cx"> '''
</span><span class="cx">
</span><ins>+ @inlineCallbacks
+ def generate(self, record, kind=None, addProps=None,):
+ self._vCard = yield vCardFromRecord(record, kind, addProps, None)
+ returnValue(self)
+
+
</ins><span class="cx"> def vCard(self):
</span><span class="cx"> return self._vCard
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> def vCardText(self):
</span><del>- return str(self.vCard())
</del><ins>+ return str(self._vCard)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def uri(self):
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavmethodreport_addressbook_querypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_addressbook_query.py (13052 => 13053)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_addressbook_query.py 2014-03-30 15:10:20 UTC (rev 13052)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report_addressbook_query.py 2014-03-30 23:06:13 UTC (rev 13053)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> def queryDirectoryBackedAddressBook(directoryBackedAddressBook, addressBookFilter):
</span><span class="cx"> """
</span><span class="cx"> """
</span><del>- results, limited[0] = (yield directoryBackedAddressBook.doAddressBookDirectoryQuery(addressBookFilter, query, max_number_of_results[0]))
</del><ins>+ results, limited[0] = yield directoryBackedAddressBook.doAddressBookDirectoryQuery(addressBookFilter, query, max_number_of_results[0], defaultKind="individual")
</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="CalendarServerbranchesuserssagenmove2who4txdavcarddavdatastorequeryfilterpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/carddav/datastore/query/filter.py (13052 => 13053)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/carddav/datastore/query/filter.py 2014-03-30 15:10:20 UTC (rev 13052)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/carddav/datastore/query/filter.py 2014-03-30 23:06:13 UTC (rev 13053)
</span><span class="lines">@@ -136,7 +136,7 @@
</span><span class="cx"> return not allof
</span><span class="cx"> return allof
</span><span class="cx"> else:
</span><del>- return True
</del><ins>+ return False
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def valid(self):
</span><span class="lines">@@ -190,9 +190,6 @@
</span><span class="cx"> else:
</span><span class="cx"> raise ValueError("Unknown child element: %s" % (qname,))
</span><span class="cx">
</span><del>- if qualifier and isinstance(qualifier, IsNotDefined) and (len(filters) != 0):
- raise ValueError("No other tests allowed when CardDAV:is-not-defined is present")
-
</del><span class="cx"> if xml_element.qname() == (carddav_namespace, "prop-filter"):
</span><span class="cx"> propfilter_test = xml_element.attributes.get("test", "anyof")
</span><span class="cx"> if propfilter_test not in ("anyof", "allof"):
</span><span class="lines">@@ -200,13 +197,16 @@
</span><span class="cx"> else:
</span><span class="cx"> propfilter_test = "anyof"
</span><span class="cx">
</span><ins>+ if qualifier and isinstance(qualifier, IsNotDefined) and (len(filters) != 0) and propfilter_test == "allof":
+ raise ValueError("When test is allof, no other tests allowed when CardDAV:is-not-defined is present")
+
</ins><span class="cx"> self.propfilter_test = propfilter_test
</span><span class="cx"> self.qualifier = qualifier
</span><span class="cx"> self.filters = filters
</span><span class="cx"> self.filter_name = xml_element.attributes["name"]
</span><span class="cx"> if isinstance(self.filter_name, unicode):
</span><span class="cx"> self.filter_name = self.filter_name.encode("utf-8")
</span><del>- self.defined = not self.qualifier or not isinstance(qualifier, IsNotDefined)
</del><ins>+ self.defined = not self.qualifier or not isinstance(qualifier, IsNotDefined) or len(filters)
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> def _deserialize(self, data):
</span><span class="lines">@@ -241,25 +241,18 @@
</span><span class="cx"> matches this filter, False otherwise.
</span><span class="cx"> """
</span><span class="cx">
</span><del>- # Always return True for the is-not-defined case as the result of this will
- # be negated by the caller
- if not self.defined:
- return True
</del><ins>+ allof = self.propfilter_test == "allof"
+ if self.qualifier and allof != self.qualifier.match(item):
+ return not allof
</ins><span class="cx">
</span><del>- if self.qualifier and not self.qualifier.match(item):
- return False
-
</del><span class="cx"> if len(self.filters) > 0:
</span><del>- allof = self.propfilter_test == "allof"
</del><span class="cx"> for filter in self.filters:
</span><span class="cx"> if allof != filter._match(item):
</span><span class="cx"> return not allof
</span><span class="cx"> return allof
</span><span class="cx"> else:
</span><del>- return True
</del><ins>+ return not allof
</ins><span class="cx">
</span><del>-
-
</del><span class="cx"> class PropertyFilter (FilterChildBase):
</span><span class="cx"> """
</span><span class="cx"> Limits a search to specific properties.
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhovcardpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/vcard.py (13052 => 13053)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/vcard.py 2014-03-30 15:10:20 UTC (rev 13052)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/vcard.py 2014-03-30 23:06:13 UTC (rev 13053)
</span><span class="lines">@@ -26,6 +26,7 @@
</span><span class="cx"> from pycalendar.vcard.n import N
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.who.idirectory import FieldName, RecordType
</span><ins>+from twisted.internet.defer import inlineCallbacks, returnValue
</ins><span class="cx"> from twistedcaldav.config import config
</span><span class="cx"> from twistedcaldav.vcard import Component, Property, vCardProductID
</span><span class="cx"> from txdav.who.idirectory import FieldName as CalFieldName, \
</span><span class="lines">@@ -42,7 +43,15 @@
</span><span class="cx"> CalRecordType.resource: "device",
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+vCardKindToRecordTypeMap = {
+ "individual" : RecordType.user,
+ "group": RecordType.group,
+ "org": RecordType.group,
+ "location": CalRecordType.location,
+ "device": CalRecordType.resource,
+}
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> # all possible generated parameters.
</span><span class="cx"> vCardPropToParamMap = {
</span><span class="cx"> #"PHOTO": {"ENCODING": ("B",), "TYPE": ("JPEG",), },
</span><span class="lines">@@ -72,6 +81,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><ins>+@inlineCallbacks
</ins><span class="cx"> def vCardFromRecord(record, kind=None, addProps=None, parentURI=None):
</span><span class="cx">
</span><span class="cx"> def isUniqueProperty(newProperty, ignoredParameters={}):
</span><span class="lines">@@ -296,13 +306,9 @@
</span><span class="cx"> vcard.addProperty(Property("X-ADDRESSBOOKSERVER-KIND", kind))
</span><span class="cx">
</span><span class="cx"> # add members
</span><del>- # FIXME: members() is a deferred. I really want non-deferred FieldName.memberUIDs
- if record.members():
- pass
- '''
- for memberRecord in (yield record.members()):
- vcard.addProperty(Property("X-ADDRESSBOOKSERVER-MEMBER", "urn:uuid:" + memberRecord.fields[FieldName.uid].encode("utf-8")))
- '''
</del><ins>+ # FIXME: members() is a deferred, so all of vCardFromRecord is deferred.
+ for memberRecord in (yield record.members()):
+ vcard.addProperty(Property("X-ADDRESSBOOKSERVER-MEMBER", "urn:uuid:" + memberRecord.fields[FieldName.uid].encode("utf-8")))
</ins><span class="cx">
</span><span class="cx"> #===================================================================
</span><span class="cx"> # vCard 4.0 http://tools.ietf.org/html/rfc6350
</span><span class="lines">@@ -321,4 +327,4 @@
</span><span class="cx"> vcard.addProperty(Property("X-ABShowAs", "COMPANY"))
</span><span class="cx">
</span><span class="cx"> log.debug("vCardFromRecord: vcard=\n{vcard}", vcard=vcard)
</span><del>- return vcard
</del><ins>+ returnValue(vcard)
</ins></span></pre>
</div>
</div>
</body>
</html>