<!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>[11932] CalendarServer/trunk/twext/who</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/11932">11932</a></dd>
<dt>Author</dt> <dd>wsanchez@apple.com</dd>
<dt>Date</dt> <dd>2013-11-09 19:40:56 -0800 (Sat, 09 Nov 2013)</dd>
</dl>
<h3>Log Message</h3>
<pre>Move logic for predicate and normalize functions to MatchType class.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServertrunktwextwhoexpressionpy">CalendarServer/trunk/twext/who/expression.py</a></li>
<li><a href="#CalendarServertrunktwextwhoindexpy">CalendarServer/trunk/twext/who/index.py</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServertrunktwextwhoexpressionpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/expression.py (11931 => 11932)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/expression.py 2013-11-09 01:48:39 UTC (rev 11931)
+++ CalendarServer/trunk/twext/who/expression.py 2013-11-10 03:40:56 UTC (rev 11932)
</span><span class="lines">@@ -31,6 +31,7 @@
</span><span class="cx"> from twisted.python.constants import Names, NamedConstant
</span><span class="cx"> from twisted.python.constants import Flags, FlagConstant
</span><span class="cx">
</span><ins>+from twext.who.util import iterFlags, describe
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> #
</span><span class="lines">@@ -93,7 +94,78 @@
</span><span class="cx"> caseInsensitive.description = u"case insensitive"
</span><span class="cx">
</span><span class="cx">
</span><ins>+ @staticmethod
+ def _setMatchFunctions(flags):
+ """
+ Compute a predicate and normalize functions for the given match
+ expression flags.
</ins><span class="cx">
</span><ins>+ @param flags: Match expression flags.
+ @type flags: L{MatchFlags}
+
+ @return: Predicate and normalize functions.
+ @rtype: L{tuple} of callables.
+ """
+ predicate = lambda x: x
+ normalize = lambda x: x
+
+ if flags is None:
+ flags = FlagConstant()
+ else:
+ for flag in iterFlags(flags):
+ if flag == MatchFlags.NOT:
+ predicate = lambda x: not x
+ elif flag == MatchFlags.caseInsensitive:
+ normalize = lambda x: x.lower()
+ else:
+ raise NotImplementedError(
+ "Unknown query flag: {0}".format(describe(flag))
+ )
+
+ flags._predicate = predicate
+ flags._normalize = normalize
+
+ return flags
+
+
+ @staticmethod
+ def predicator(flags):
+ """
+ Determine a predicate function for the given flags.
+
+ @param flags: Match expression flags.
+ @type flags: L{MatchFlags}
+
+ @return: a L{callable} that accepts an L{object} argument and returns a
+ L{object} that has the opposite or same truth value as the argument,
+ depending on whether L{MatchFlags.NOT} is or is not in C{flags}.
+ @rtype: callable
+ """
+ if not hasattr(flags, "_predicate"):
+ flags = MatchFlags._setMatchFunctions(flags)
+ return flags._predicate
+
+
+ @staticmethod
+ def normalizer(flags):
+ """
+ Determine a predicate function for the given flags.
+
+ @param flags: Match expression flags.
+ @type flags: L{MatchFlags}
+
+ @return: a L{callable} that accepts a L{unicode} and returns the same
+ L{unicode} or a normalized L{unicode} that can be compared with other
+ normalized L{unicode}s in a case-insensitive fashion, depending on
+ whether L{MatchFlags.caseInsensitive} is not or is in C{flags}.
+ @rtype: callable
+ """
+ if not hasattr(flags, "_normalize"):
+ flags = MatchFlags._setMatchFunctions(flags)
+ return flags._normalize
+
+
+
</ins><span class="cx"> class MatchExpression(object):
</span><span class="cx"> """
</span><span class="cx"> Query for a matching value in a given field.
</span></span></pre></div>
<a id="CalendarServertrunktwextwhoindexpy"></a>
<div class="modfile"><h4>Modified: CalendarServer/trunk/twext/who/index.py (11931 => 11932)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/trunk/twext/who/index.py 2013-11-09 01:48:39 UTC (rev 11931)
+++ CalendarServer/trunk/twext/who/index.py 2013-11-10 03:40:56 UTC (rev 11932)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> from twisted.internet.defer import succeed, inlineCallbacks, returnValue
</span><span class="cx">
</span><span class="cx"> from twext.who.util import ConstantsContainer
</span><del>-from twext.who.util import describe, uniqueResult, iterFlags
</del><ins>+from twext.who.util import describe, uniqueResult
</ins><span class="cx"> from twext.who.idirectory import FieldName as BaseFieldName
</span><span class="cx"> from twext.who.expression import MatchExpression, MatchType, MatchFlags
</span><span class="cx"> from twext.who.directory import DirectoryService as BaseDirectoryService
</span><span class="lines">@@ -113,35 +113,6 @@
</span><span class="cx"> self._index = None
</span><span class="cx">
</span><span class="cx">
</span><del>- @staticmethod
- def _matchFlags(flags):
- """
- Compute a predicate and normalize functions for the given match
- expression flags.
-
- @param flags: Match expression flags.
- @type flags: L{MatchFlags}
-
- @return: Predicate and normalize functions.
- @rtype: L{tuple} of callables.
- """
- predicate = lambda x: x
- normalize = lambda x: x
-
- if flags is not None:
- for flag in iterFlags(flags):
- if flag == MatchFlags.NOT:
- predicate = lambda x: not x
- elif flag == MatchFlags.caseInsensitive:
- normalize = lambda x: x.lower()
- else:
- raise NotImplementedError(
- "Unknown query flag: {0}".format(describe(flag))
- )
-
- return predicate, normalize
-
-
</del><span class="cx"> def indexedRecordsFromMatchExpression(self, expression, records=None):
</span><span class="cx"> """
</span><span class="cx"> Finds records in the internal indexes matching a single expression.
</span><span class="lines">@@ -156,7 +127,8 @@
</span><span class="cx"> @return: The matching records.
</span><span class="cx"> @rtype: deferred iterable of L{DirectoryRecord}s
</span><span class="cx"> """
</span><del>- predicate, normalize = self._matchFlags(expression.flags)
</del><ins>+ predicate = MatchFlags.predicator(expression.flags)
+ normalize = MatchFlags.normalizer(expression.flags)
</ins><span class="cx">
</span><span class="cx"> fieldIndex = self.index[expression.fieldName]
</span><span class="cx"> matchValue = normalize(expression.fieldValue)
</span><span class="lines">@@ -210,7 +182,8 @@
</span><span class="cx"> @return: The matching records.
</span><span class="cx"> @rtype: deferred iterable of L{DirectoryRecord}s
</span><span class="cx"> """
</span><del>- predicate, normalize = self._matchFlags(expression.flags)
</del><ins>+ predicate = MatchFlags.predicator(expression.flags)
+ normalize = MatchFlags.normalizer(expression.flags)
</ins><span class="cx">
</span><span class="cx"> matchValue = normalize(expression.fieldValue)
</span><span class="cx"> matchType = expression.matchType
</span></span></pre>
</div>
</div>
</body>
</html>