[CalendarServer-changes] [691] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 691
          http://trac.macosforge.org/projects/calendarserver/changeset/691
Author:   cdaboo at apple.com
Date:     2006-12-05 10:46:51 -0800 (Tue, 05 Dec 2006)

Log Message:
-----------
Fix inbox resource lookup.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/directory/principal.py
    CalendarServer/trunk/twistedcaldav/resource.py

Modified: CalendarServer/trunk/twistedcaldav/directory/principal.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/directory/principal.py	2006-12-05 18:29:06 UTC (rev 690)
+++ CalendarServer/trunk/twistedcaldav/directory/principal.py	2006-12-05 18:46:51 UTC (rev 691)
@@ -315,7 +315,7 @@
         # the directory record provides.
         return (self.principalURL(),) + tuple(self.record.calendarUserAddresses)
 
-    def scheduleInbox(self):
+    def scheduleInbox(self, request):
         home = self._calendarHome()
         if home is None:
             return succeed(None)

Modified: CalendarServer/trunk/twistedcaldav/resource.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/resource.py	2006-12-05 18:29:06 UTC (rev 690)
+++ CalendarServer/trunk/twistedcaldav/resource.py	2006-12-05 18:46:51 UTC (rev 691)
@@ -633,32 +633,30 @@
             if inbox is None:
                 return ()
 
+            def getFreeBusy(has):
+                if not has:
+                    return ()
+    
+                def parseFreeBusy(freeBusySet):
+                    return (str(href) for href in freeBusySet.children)
+        
+                d = inbox.readProperty((caldav_namespace, "calendar-free-busy-set"), request)
+                d.addCallback(parseFreeBusy)
+                return d
+    
             d = inbox.hasProperty((caldav_namespace, "calendar-free-busy-set"), request)
             d.addCallback(getFreeBusy)
             return d
 
-        def getFreeBusy(has):
-            if not has:
-                return ()
-
-            d = inbox.readProperty((caldav_namespace, "calendar-free-busy-set"), request)
-            d.addCallback(parseFreeBusy)
-            return d
-
-        def parseFreeBusy(freeBusySet):
-            return (str(href) for href in freeBusySet.children)
-
-        d = self.scheduleInbox()
+        d = self.scheduleInbox(request)
         d.addCallback(gotInbox)
         return d
 
-    def scheduleInbox(self):
+    def scheduleInbox(self, request):
         """
         @return: the deferred schedule inbox for this principal.
         """
-        d = request.locateResource(self.scheduleInboxURL())
-        d.addCallback(gotInbox)
-        return d
+        return request.locateResource(self.scheduleInboxURL())
 
     def scheduleInboxURL(self):
         if self.hasDeadProperty((caldav_namespace, "schedule-inbox-URL")):

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20061205/6a318c29/attachment.html