[CalendarServer-changes] [7921] CalendarServer/branches/users/glyph/imip-and-admin-html/ calendarserver/webadmin

[source_changes at macosforge.org]

Revision: 7921
          http://trac.macosforge.org/projects/calendarserver/changeset/7921
Author:   glyph at apple.com
Date:     2011-08-11 21:43:59 -0700 (Thu, 11 Aug 2011)
Log Message:
-----------
only perform the search once.

Modified Paths:
--------------
    CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py
    CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/resource.py
===================================================================
--- 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)
@@ -92,13 +92,18 @@
         returnValue(tag)
 
 
+    _searchResults = None
+
     @inlineCallbacks
     def performSearch(self, request):
+        if self._searchResults is not None:
+            returnValue(self._searchResults)
         searchTerm = request.args.get('resourceSearch', [''])[0]
         if searchTerm:
             results = yield self.resource.search(searchTerm)
         else:
             results = []
+        self._searchResults = results
         returnValue(results)
 
 

Modified: CalendarServer/branches/users/glyph/imip-and-admin-html/calendarserver/webadmin/test/test_resource.py
===================================================================
--- 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)
@@ -54,7 +54,7 @@
         # 'fields' will be a list of 4-tuples of (fieldName, searchStr, True,
         # "contains"; implement this for tests which will want to call
         # 'search()')
-        return self.expectedSearches[tuple(fields)]
+        return self.expectedSearches.pop(tuple(fields))
 
 
     def setUp(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20110811/b704b93c/attachment.html>