<!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>[13125] 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/13125">13125</a></dd>
<dt>Author</dt> <dd>sagen@apple.com</dd>
<dt>Date</dt> <dd>2014-04-02 11:59:40 -0700 (Wed, 02 Apr 2014)</dd>
</dl>

<h3>Log Message</h3>
<pre>Handle GUID searches better in recordsMatchingFields</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectoryprincipalpy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4twistedcaldavmethodreportpy">CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpsserverpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavdpstesttest_clientpy">CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py</a></li>
<li><a href="#CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy">CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavdirectoryprincipalpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py (13124 => 13125)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py        2014-04-02 18:53:05 UTC (rev 13124)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/directory/principal.py        2014-04-02 18:59:40 UTC (rev 13125)
</span><span class="lines">@@ -117,7 +117,7 @@
</span><span class="cx">     cua = normalizeCUAddr(origCUAddr)
</span><span class="cx"> 
</span><span class="cx">     if cua.startswith(&quot;urn:uuid:&quot;):
</span><del>-        return &quot;guid&quot;, cua[9:]
</del><ins>+        return &quot;guid&quot;, uuid.UUID(cua[9:])
</ins><span class="cx"> 
</span><span class="cx">     elif cua.startswith(&quot;mailto:&quot;):
</span><span class="cx">         return &quot;emailAddresses&quot;, cua[7:]
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4twistedcaldavmethodreportpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report.py (13124 => 13125)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report.py        2014-04-02 18:53:05 UTC (rev 13124)
+++ CalendarServer/branches/users/sagen/move2who-4/twistedcaldav/method/report.py        2014-04-02 18:59:40 UTC (rev 13125)
</span><span class="lines">@@ -117,8 +117,8 @@
</span><span class="cx">         #
</span><span class="cx">         # Requested report is not supported.
</span><span class="cx">         #
</span><del>-        log.error(&quot;Unsupported REPORT %s for resource %s (no method %s)&quot;
-                  % (encodeXMLName(namespace, name), self, method_name))
</del><ins>+        log.error(&quot;Unsupported REPORT {name} for resource {resource} (no method {method})&quot;,
+                  name=encodeXMLName(namespace, name), resource=self, method=method_name)
</ins><span class="cx"> 
</span><span class="cx">         raise HTTPError(ErrorResponse(
</span><span class="cx">             responsecode.FORBIDDEN,
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpsclientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py (13124 => 13125)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py        2014-04-02 18:53:05 UTC (rev 13124)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/client.py        2014-04-02 18:59:40 UTC (rev 13125)
</span><span class="lines">@@ -262,6 +262,10 @@
</span><span class="cx">     ):
</span><span class="cx">         newFields = []
</span><span class="cx">         for fieldName, searchTerm, matchFlags, matchType in fields:
</span><ins>+
+            if isinstance(searchTerm, uuid.UUID):
+                searchTerm = unicode(searchTerm)
+
</ins><span class="cx">             newFields.append(
</span><span class="cx">                 (
</span><span class="cx">                     fieldName.encode(&quot;utf-8&quot;),
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpsserverpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py (13124 => 13125)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py        2014-04-02 18:53:05 UTC (rev 13124)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/server.py        2014-04-02 18:59:40 UTC (rev 13125)
</span><span class="lines">@@ -190,6 +190,14 @@
</span><span class="cx">         for fieldName, searchTerm, matchFlags, matchType in fields:
</span><span class="cx">             fieldName = fieldName.decode(&quot;utf-8&quot;)
</span><span class="cx">             searchTerm = searchTerm.decode(&quot;utf-8&quot;)
</span><ins>+            try:
+                field = self._directory.fieldName.lookupByName(fieldName)
+            except ValueError:
+                field = None
+            if field:
+                valueType = self._directory.fieldName.valueType(field)
+                if valueType is uuid.UUID:
+                    searchTerm = uuid.UUID(searchTerm)
</ins><span class="cx">             matchFlags = MatchFlags.lookupByName(matchFlags.decode(&quot;utf-8&quot;))
</span><span class="cx">             matchType = MatchType.lookupByName(matchType.decode(&quot;utf-8&quot;))
</span><span class="cx">             newFields.append((fieldName, searchTerm, matchFlags, matchType))
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavdpstesttest_clientpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py (13124 => 13125)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py        2014-04-02 18:53:05 UTC (rev 13124)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/dps/test/test_client.py        2014-04-02 18:59:40 UTC (rev 13125)
</span><span class="lines">@@ -15,6 +15,7 @@
</span><span class="cx"> ##
</span><span class="cx"> 
</span><span class="cx"> import os
</span><ins>+import uuid
</ins><span class="cx"> 
</span><span class="cx"> from twext.who.expression import (
</span><span class="cx">     Operand, MatchType, MatchFlags, MatchExpression
</span><span class="lines">@@ -213,6 +214,23 @@
</span><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     @inlineCallbacks
</span><ins>+    def test_recordsMatchingFields_nonUnicode(self):
+        fields = (
+            (u&quot;guid&quot;, uuid.UUID(&quot;A3B1158F-0564-4F5B-81E4-A89EA5FF81B0&quot;),
+                MatchFlags.caseInsensitive, MatchType.equals),
+        )
+        records = (yield self.directory.recordsMatchingFields(
+            fields, operand=Operand.OR, recordType=None
+        ))
+        matchingShortNames = set()
+        for r in records:
+            for shortName in r.shortNames:
+                matchingShortNames.add(shortName)
+        self.assertTrue(&quot;dre&quot; in matchingShortNames)
+        self.assertFalse(&quot;wsanchez&quot; in matchingShortNames)
+
+
+    @inlineCallbacks
</ins><span class="cx">     def test_recordsFromMatchExpression(self):
</span><span class="cx">         expression = MatchExpression(
</span><span class="cx">             FieldName.uid,
</span></span></pre></div>
<a id="CalendarServerbranchesuserssagenmove2who4txdavwhodirectorypy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py (13124 => 13125)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py        2014-04-02 18:53:05 UTC (rev 13124)
+++ CalendarServer/branches/users/sagen/move2who-4/txdav/who/directory.py        2014-04-02 18:59:40 UTC (rev 13125)
</span><span class="lines">@@ -151,8 +151,6 @@
</span><span class="cx">                     fieldName=fieldName
</span><span class="cx">                 )
</span><span class="cx">                 continue
</span><del>-            if self.fieldName.valueType(field) is uuid.UUID and isinstance(searchTerm, unicode):
-                searchTerm = uuid.UUID(searchTerm)
</del><span class="cx">             subExpression = MatchExpression(
</span><span class="cx">                 field,
</span><span class="cx">                 searchTerm,
</span></span></pre>
</div>
</div>

</body>
</html>