[CalendarServer-changes] [2756] CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/ method

[source_changes at macosforge.org]

Revision: 2756
          http://trac.macosforge.org/projects/calendarserver/changeset/2756
Author:   cdaboo at apple.com
Date:     2008-07-23 07:14:39 -0700 (Wed, 23 Jul 2008)
Log Message:
-----------
Allow the applyToCalendarCollections loop to terminate if the callback so desires.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_calquery.py
    CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_common.py
    CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_freebusy.py

Modified: CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_calquery.py
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_calquery.py	2008-07-23 14:13:06 UTC (rev 2755)
+++ CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_calquery.py	2008-07-23 14:14:39 UTC (rev 2756)
@@ -209,6 +209,8 @@
             calendar = calresource.iCalendar()
             yield queryCalendarObjectResource(calresource, uri, None, calendar)
 
+        returnValue(True)
+
     # Run report taking depth into account
     try:
         depth = request.headers.getHeader("depth", "0")

Modified: CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_common.py	2008-07-23 14:13:06 UTC (rev 2755)
+++ CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_common.py	2008-07-23 14:14:39 UTC (rev 2756)
@@ -71,10 +71,11 @@
     """
 
     # First check the privilege on this resource
-    try:
-        yield resource.checkPrivileges(request, privileges)
-    except AccessDeniedError:
-        return
+    if privileges:
+        try:
+            yield resource.checkPrivileges(request, privileges)
+        except AccessDeniedError:
+            return
 
     # When scanning we only go down as far as a calendar collection - not into one
     if resource.isPseudoCalendarCollection():
@@ -86,7 +87,9 @@
         yield resource.findCalendarCollections(depth, request, lambda x, y: resources.append((x, y)), privileges = privileges)
          
     for calresource, uri in resources:
-        yield apply(calresource, uri)
+        result = (yield apply(calresource, uri))
+        if not result:
+            break
 
 def responseForHref(request, responses, href, resource, calendar, propertiesForResource, propertyreq, isowner=True):
     """

Modified: CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_freebusy.py
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_freebusy.py	2008-07-23 14:13:06 UTC (rev 2755)
+++ CalendarServer/branches/users/cdaboo/implicit-2660/twistedcaldav/method/report_freebusy.py	2008-07-23 14:14:39 UTC (rev 2756)
@@ -66,6 +66,7 @@
         @param uri: the uri for the calendar collecton resource.
         """
         matchcount[0] = (yield report_common.generateFreeBusyInfo(request, calresource, fbinfo, timerange, matchcount[0]))
+        returnValue(True)
 
     # Run report taking depth into account
     try:
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080723/ecd39232/attachment.html