[CalendarServer-changes] [1808] CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav /schedule.py

[source_changes at macosforge.org]

Revision: 1808
          http://trac.macosforge.org/projects/calendarserver/changeset/1808
Author:   wsanchez at apple.com
Date:     2007-08-20 16:08:03 -0700 (Mon, 20 Aug 2007)

Log Message:
-----------
Pulled up r1799 from trunk.

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/schedule.py

Modified: CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/schedule.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/schedule.py	2007-08-20 23:07:17 UTC (rev 1807)
+++ CalendarServer/branches/release/CalendarServer-1.0-dev/twistedcaldav/schedule.py	2007-08-20 23:08:03 UTC (rev 1808)
@@ -138,7 +138,15 @@
                 ))
 
         elif property.qname() == (caldav_namespace, "calendar-free-busy-set"):
-            for href in property.children:
+            # Verify that the calendars added in the PROPPATCH are valid. We do not check
+            # whether existing items in the property are still valid - only new ones.
+            new_calendars = set([str(href) for href in property.children])
+            if not self.hasDeadProperty(property):
+                old_calendars = set()
+            else:
+                old_calendars = set([str(href) for href in self.readDeadProperty(property).children])
+            added_calendars = new_calendars.difference(old_calendars)
+            for href in added_calendars:
                 cal = waitForDeferred(request.locateResource(str(href)))
                 yield cal
                 cal = cal.getResult()

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