<!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>[7921] CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin</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.macosforge.org/projects/calendarserver/changeset/7921">7921</a></dd>
<dt>Author</dt> <dd>glyph@apple.com</dd>
<dt>Date</dt> <dd>2011-08-11 21:43:59 -0700 (Thu, 11 Aug 2011)</dd>
</dl>

<h3>Log Message</h3>
<pre>only perform the search once.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#CalendarServerbranchesusersglyphimipandadminhtmlcalendarserverwebadminresourcepy">CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py</a></li>
<li><a href="#CalendarServerbranchesusersglyphimipandadminhtmlcalendarserverwebadmintesttest_resourcepy">CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="CalendarServerbranchesusersglyphimipandadminhtmlcalendarserverwebadminresourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py (7920 => 7921)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py      2011-08-12 04:43:47 UTC (rev 7920)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py 2011-08-12 04:43:59 UTC (rev 7921)
</span><span class="lines">@@ -92,13 +92,18 @@
</span><span class="cx">         returnValue(tag)
</span><span class="cx"> 
</span><span class="cx"> 
</span><ins>+    _searchResults = None
+
</ins><span class="cx">     @inlineCallbacks
</span><span class="cx">     def performSearch(self, request):
</span><ins>+        if self._searchResults is not None:
+            returnValue(self._searchResults)
</ins><span class="cx">         searchTerm = request.args.get('resourceSearch', [''])[0]
</span><span class="cx">         if searchTerm:
</span><span class="cx">             results = yield self.resource.search(searchTerm)
</span><span class="cx">         else:
</span><span class="cx">             results = []
</span><ins>+        self._searchResults = results
</ins><span class="cx">         returnValue(results)
</span><span class="cx"> 
</span><span class="cx"> 
</span></span></pre></div>
<a id="CalendarServerbranchesusersglyphimipandadminhtmlcalendarserverwebadmintesttest_resourcepy"></a>
<div class="modfile"><h4>Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py (7920 => 7921)</h4>
<pre class="diff"><span>
<span class="info">--- CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py    2011-08-12 04:43:47 UTC (rev 7920)
+++ CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py       2011-08-12 04:43:59 UTC (rev 7921)
</span><span class="lines">@@ -54,7 +54,7 @@
</span><span class="cx">         # 'fields' will be a list of 4-tuples of (fieldName, searchStr, True,
</span><span class="cx">         # "contains"; implement this for tests which will want to call
</span><span class="cx">         # 'search()')
</span><del>-        return self.expectedSearches[tuple(fields)]
</del><ins>+        return self.expectedSearches.pop(tuple(fields))
</ins><span class="cx"> 
</span><span class="cx"> 
</span><span class="cx">     def setUp(self):
</span></span></pre>
</div>
</div>

</body>
</html>