<!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>[12882] CalendarServer/branches/users/sagen/move2who-2/txdav</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/12882">12882</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-03-12 12:59:21 -0700 (Wed, 12 Mar 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>recordsMatchingFields now works accross AMP</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who2txdavdpsclientpy">CalendarServer/branches/users/sagen/move2who-2/txdav/dps/client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who2txdavdpscommandspy">CalendarServer/branches/users/sagen/move2who-2/txdav/dps/commands.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who2txdavdpsserverpy">CalendarServer/branches/users/sagen/move2who-2/txdav/dps/server.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who2txdavwhodirectorypy">CalendarServer/branches/users/sagen/move2who-2/txdav/who/directory.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who2txdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-2/txdav/dps/client.py (12881 => 12882)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-2/txdav/dps/client.py 2014-03-12 18:49:18 UTC (rev 12881)
+++ CalendarServer/branches/users/sagen/move2who-2/txdav/dps/client.py 2014-03-12 19:59:21 UTC (rev 12882)
</span><span class="lines">@@ -20,6 +20,7 @@
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.who.directory import DirectoryRecord as BaseDirectoryRecord
</span><span class="cx"> from twext.who.directory import DirectoryService as BaseDirectoryService
</span><ins>+from twext.who.expression import Operand
</ins><span class="cx"> from twext.who.idirectory import RecordType, IDirectoryService
</span><span class="cx"> import twext.who.idirectory
</span><span class="cx"> from twext.who.util import ConstantsContainer
</span><span class="lines">@@ -33,7 +34,7 @@
</span><span class="cx"> from txdav.dps.commands import (
</span><span class="cx"> RecordWithShortNameCommand, RecordWithUIDCommand, RecordWithGUIDCommand,
</span><span class="cx"> RecordsWithRecordTypeCommand, RecordsWithEmailAddressCommand,
</span><del>- RecordsMatchingTokensCommand,
</del><ins>+ RecordsMatchingTokensCommand, RecordsMatchingFieldsCommand,
</ins><span class="cx"> MembersCommand, GroupsCommand, SetMembersCommand,
</span><span class="cx"> VerifyPlaintextPasswordCommand, VerifyHTTPDigestCommand
</span><span class="cx"> )
</span><span class="lines">@@ -244,15 +245,33 @@
</span><span class="cx"> )
</span><span class="cx">
</span><span class="cx">
</span><del>- def recordsMatchingFields(self, fields, operand="or", recordType=None):
- # MOVE2WHO FIXME: Need to add an AMP command
- raise NotImplementedError
</del><ins>+ def recordsMatchingFields(self, fields, operand=Operand.OR, recordType=None):
</ins><span class="cx">
</span><ins>+ newFields = []
+ for fieldName, searchTerm, matchFlags, matchType in fields:
+ newFields.append(
+ (
+ fieldName.encode("utf-8"),
+ searchTerm.encode("utf-8"),
+ matchFlags.name.encode("utf-8"),
+ matchType.name.encode("utf-8")
+ )
+ )
+ if recordType is not None:
+ recordType = recordType.name.encode("utf-8")
</ins><span class="cx">
</span><ins>+ return self._call(
+ RecordsMatchingFieldsCommand,
+ self._processMultipleRecords,
+ fields=newFields,
+ operand=operand.name.encode("utf-8"),
+ recordType=recordType
+ )
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> @implementer(ICalendarStoreDirectoryRecord)
</span><span class="cx"> class DirectoryRecord(BaseDirectoryRecord, CalendarDirectoryRecordMixin):
</span><span class="cx">
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who2txdavdpscommandspy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-2/txdav/dps/commands.py (12881 => 12882)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-2/txdav/dps/commands.py 2014-03-12 18:49:18 UTC (rev 12881)
+++ CalendarServer/branches/users/sagen/move2who-2/txdav/dps/commands.py 2014-03-12 19:59:21 UTC (rev 12882)
</span><span class="lines">@@ -77,6 +77,17 @@
</span><span class="cx"> ]
</span><span class="cx">
</span><span class="cx">
</span><ins>+class RecordsMatchingFieldsCommand(amp.Command):
+ arguments = [
+ ('fields', amp.ListOf(amp.ListOf(amp.String()))),
+ ('operand', amp.String()),
+ ('recordType', amp.String(optional=True)),
+ ]
+ response = [
+ ('fieldsList', amp.String()),
+ ]
+
+
</ins><span class="cx"> class UpdateRecordsCommand(amp.Command):
</span><span class="cx"> arguments = [
</span><span class="cx"> ('fieldsList', amp.String()),
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who2txdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-2/txdav/dps/server.py (12881 => 12882)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-2/txdav/dps/server.py 2014-03-12 18:49:18 UTC (rev 12881)
+++ CalendarServer/branches/users/sagen/move2who-2/txdav/dps/server.py 2014-03-12 19:59:21 UTC (rev 12882)
</span><span class="lines">@@ -21,6 +21,7 @@
</span><span class="cx"> from calendarserver.tap.util import getDBPool, storeFromConfig
</span><span class="cx"> from twext.python.log import Logger
</span><span class="cx"> from twext.who.aggregate import DirectoryService as AggregateDirectoryService
</span><ins>+from twext.who.expression import MatchType, MatchFlags, Operand
</ins><span class="cx"> from twext.who.idirectory import RecordType
</span><span class="cx"> from twext.who.ldap import DirectoryService as LDAPDirectoryService
</span><span class="cx"> from twisted.application import service
</span><span class="lines">@@ -39,7 +40,7 @@
</span><span class="cx"> from txdav.dps.commands import (
</span><span class="cx"> RecordWithShortNameCommand, RecordWithUIDCommand, RecordWithGUIDCommand,
</span><span class="cx"> RecordsWithRecordTypeCommand, RecordsWithEmailAddressCommand,
</span><del>- RecordsMatchingTokensCommand,
</del><ins>+ RecordsMatchingTokensCommand, RecordsMatchingFieldsCommand,
</ins><span class="cx"> MembersCommand, GroupsCommand, SetMembersCommand,
</span><span class="cx"> VerifyPlaintextPasswordCommand, VerifyHTTPDigestCommand,
</span><span class="cx"> # UpdateRecordsCommand, RemoveRecordsCommand
</span><span class="lines">@@ -190,6 +191,33 @@
</span><span class="cx"> returnValue(response)
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @RecordsMatchingFieldsCommand.responder
+ @inlineCallbacks
+ def recordsMatchingFields(self, fields, operand="OR", recordType=None):
+ log.debug("RecordsMatchingFields")
+ newFields = []
+ for fieldName, searchTerm, matchFlags, matchType in fields:
+ fieldName = fieldName.decode("utf-8")
+ searchTerm = searchTerm.decode("utf-8")
+ matchFlags = MatchFlags.lookupByName(matchFlags.decode("utf-8"))
+ matchType = MatchType.lookupByName(matchType.decode("utf-8"))
+ newFields.append((fieldName, searchTerm, matchFlags, matchType))
+ operand = Operand.lookupByName(operand)
+ if recordType:
+ recordType = RecordType.lookupByName(recordType)
+ records = yield self._directory.recordsMatchingFields(
+ newFields, operand=operand, recordType=recordType
+ )
+ fieldsList = []
+ for record in records:
+ fieldsList.append(self.recordToDict(record))
+ response = {
+ "fieldsList": pickle.dumps(fieldsList),
+ }
+ log.debug("Responding with: {response}", response=response)
+ returnValue(response)
+
+
</ins><span class="cx"> @MembersCommand.responder
</span><span class="cx"> @inlineCallbacks
</span><span class="cx"> def members(self, uid):
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who2txdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-2/txdav/who/directory.py (12881 => 12882)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-2/txdav/who/directory.py 2014-03-12 18:49:18 UTC (rev 12881)
+++ CalendarServer/branches/users/sagen/move2who-2/txdav/who/directory.py 2014-03-12 19:59:21 UTC (rev 12882)
</span><span class="lines">@@ -134,14 +134,14 @@
</span><span class="cx"> """
</span><span class="cx"> subExpressions = []
</span><span class="cx"> for fieldName, searchTerm, matchFlags, matchType in fields:
</span><del>- subExpressions.append(
- MatchExpression(
- self.fieldName.lookupByName(fieldName),
- searchTerm,
- matchType,
- matchFlags
- )
</del><ins>+ subExpression = MatchExpression(
+ self.fieldName.lookupByName(fieldName),
+ searchTerm,
+ matchType,
+ matchFlags
</ins><span class="cx"> )
</span><ins>+ subExpressions.append(subExpression)
+
</ins><span class="cx"> expression = CompoundExpression(subExpressions, operand)
</span><span class="cx"> return self.recordsFromExpression(expression)
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>