[CalendarServer-changes] [2857] CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav

[source_changes at macosforge.org]

Revision: 2857
          http://trac.macosforge.org/projects/calendarserver/changeset/2857
Author:   cdaboo at apple.com
Date:     2008-08-25 08:07:41 -0700 (Mon, 25 Aug 2008)
Log Message:
-----------
Properly normalize the free-busy-set URLs and make sure the provisioning goes through the new api.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/directory/calendar.py
    CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/schedule.py

Modified: CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/directory/calendar.py
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/directory/calendar.py	2008-08-25 03:44:13 UTC (rev 2856)
+++ CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/directory/calendar.py	2008-08-25 15:07:41 UTC (rev 2857)
@@ -298,7 +298,7 @@
             # Set calendar-free-busy-set on inbox
             inbox = self.getChild("inbox")
             inbox.provision()
-            inbox.writeDeadProperty(caldavxml.CalendarFreeBusySet(davxml.HRef(childURL)))
+            inbox.processFreeBusyCalendar(childURL, True)
 
             # Default calendar may need to be marked as the default for scheduling
             if config.Scheduling["CalDAV"]["DefaultCalendarProvisioned"]:

Modified: CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/schedule.py
===================================================================
--- CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/schedule.py	2008-08-25 03:44:13 UTC (rev 2856)
+++ CalendarServer/branches/users/cdaboo/implicit-2805/twistedcaldav/schedule.py	2008-08-25 15:07:41 UTC (rev 2857)
@@ -137,6 +137,7 @@
         elif property.qname() == (caldav_namespace, "calendar-free-busy-set"):
             # 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.
+            property.children = [davxml.HRef(normalizeURL(str(href))) for href in property.children]
             new_calendars = set([str(href) for href in property.children])
             if not self.hasDeadProperty(property):
                 old_calendars = set()
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080825/d4b3bbb7/attachment.html