[CalendarServer-changes] [1432] CalendarServer/branches/users/cdaboo/fast-multiget-1425/ twistedcaldav/method/report_multiget.py

[source_changes at macosforge.org]

Revision: 1432
          http://trac.macosforge.org/projects/calendarserver/changeset/1432
Author:   cdaboo at apple.com
Date:     2007-03-28 13:57:33 -0700 (Wed, 28 Mar 2007)

Log Message:
-----------
Fix some test case bugs.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py

Modified: CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py
===================================================================
--- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py	2007-03-28 20:24:08 UTC (rev 1431)
+++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py	2007-03-28 20:57:33 UTC (rev 1432)
@@ -133,13 +133,16 @@
                     responses.append(davxml.StatusResponse(href, davxml.Status.fromResponseCode(responsecode.NOT_FOUND)))
                 else:
                     valid_names.append(name)
-            
+            if not valid_names:
+                yield None
+                return
+        
             # Verify that valid requested resources are calendar objects
-            exists_names = self.index().resourcesExist(valid_names)
+            exists_names = tuple(self.index().resourcesExist(valid_names))
             checked_names = []
             for name in valid_names:
-                href = joinURL(request.uri, name)
                 if name not in exists_names:
+                    href = davxml.HRef.fromString(joinURL(request.uri, name))
                     responses.append(davxml.StatusResponse(href, davxml.Status.fromResponseCode(responsecode.NOT_ALLOWED)))
                 else:
                     checked_names.append(name)
@@ -162,13 +165,13 @@
 
             # Get properties for all valid readable resources
             for resource, href in ok_resources:
-                d = waitForDeferred(report_common.responseForHref(request, responses, href, resource, None, propertiesForResource, propertyreq))
+                d = waitForDeferred(report_common.responseForHref(request, responses, davxml.HRef.fromString(href), resource, None, propertiesForResource, propertyreq))
                 yield d
                 d.getResult()
     
             # Indicate error for all valid non-readable resources
             for ignore_resource, href in bad_resources:
-                responses.append(davxml.StatusResponse(href, davxml.Status.fromResponseCode(responsecode.NOT_ALLOWED)))
+                responses.append(davxml.StatusResponse(davxml.HRef.fromString(href), davxml.Status.fromResponseCode(responsecode.NOT_ALLOWED)))
     
         doCalendarResponse = deferredGenerator(doCalendarResponse)
 

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20070328/76ad8ce4/attachment.html