[CalendarServer-changes] [9559] CalendarServer/trunk/calendarserver/webadmin

[source_changes at macosforge.org]

Revision: 9559
          http://trac.macosforge.org/projects/calendarserver/changeset/9559
Author:   sagen at apple.com
Date:     2012-08-10 18:27:20 -0700 (Fri, 10 Aug 2012)
Log Message:
-----------
Converts /admin to use recordsMatchingTokens()

Modified Paths:
--------------
    CalendarServer/trunk/calendarserver/webadmin/resource.py
    CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py

Modified: CalendarServer/trunk/calendarserver/webadmin/resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/resource.py	2012-08-11 01:24:20 UTC (rev 9558)
+++ CalendarServer/trunk/calendarserver/webadmin/resource.py	2012-08-11 01:27:20 UTC (rev 9559)
@@ -685,11 +685,5 @@
 
     @inlineCallbacks
     def search(self, searchStr):
-        fields = []
-        for fieldName in ("fullName", "firstName", "lastName",
-                          "emailAddresses"):
-            fields.append((fieldName, searchStr, True, "contains"))
-
-        records = list((yield self.directory.recordsMatchingFields(fields)))
-        # records = list((yield self.directory.recordsMatchingTokens(searchStr.strip().split())))
+        records = list((yield self.directory.recordsMatchingTokens(searchStr.strip().split())))
         returnValue(records)

Modified: CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py
===================================================================
--- CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py	2012-08-11 01:24:20 UTC (rev 9558)
+++ CalendarServer/trunk/calendarserver/webadmin/test/test_resource.py	2012-08-11 01:27:20 UTC (rev 9559)
@@ -31,6 +31,7 @@
 from calendarserver.tap.util import FakeRequest
 from twisted.internet.defer import inlineCallbacks
 from twisted.internet.defer import returnValue
+from twisted.internet.defer import succeed
 from calendarserver.webadmin.resource import WebAdminResource
 
 from txdav.xml.rfc3744 import GroupMemberSet
@@ -53,20 +54,14 @@
         Expect that a search will be issued via with the given fields, and will
         yield the given result.
         """
-        fields = []
-        for field in 'fullName', 'firstName', 'lastName', 'emailAddresses':
-            fields.append((field, searchString, True, "contains"))
-        self.expectedSearches[tuple(fields)] = result
+        self.expectedSearches[(searchString,)] = result
 
 
-    def recordsMatchingFields(self, fields):
+    def recordsMatchingTokens(self, tokens):
         """
         Pretend to be a directory object for the purposes of testing.
         """
-        # '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.pop(tuple(fields))
+        return succeed(self.expectedSearches.pop(tuple(tokens)))
 
 
     def setUp(self):
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20120810/e420da4a/attachment-0001.html>