[CalendarServer-changes] [2370] CalendarServer/trunk/twistedcaldav/caldavxml.py

[source_changes at macosforge.org]

Revision: 2370
          http://trac.macosforge.org/projects/calendarserver/changeset/2370
Author:   cdaboo at apple.com
Date:     2008-05-05 19:24:26 -0700 (Mon, 05 May 2008)

Log Message:
-----------
Empty <C:comp> element in calendar-query means return all properties and sub-components.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/caldavxml.py

Modified: CalendarServer/trunk/twistedcaldav/caldavxml.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/caldavxml.py	2008-05-05 20:38:00 UTC (rev 2369)
+++ CalendarServer/trunk/twistedcaldav/caldavxml.py	2008-05-06 02:24:26 UTC (rev 2370)
@@ -795,6 +795,13 @@
         result = iComponent(self.type)
 
         xml_components = self.components
+        xml_properties = self.properties
+
+        # Empty element means do all properties and components
+        if xml_components is None and xml_properties is None:
+            xml_components = AllComponents()
+            xml_properties = AllProperties()
+
         if xml_components is not None:
             if xml_components == AllComponents():
                 for ical_subcomponent in component.subcomponents():
@@ -805,7 +812,6 @@
                         if ical_subcomponent.name() == xml_subcomponent.type:
                             result.addComponent(xml_subcomponent.getFromICalendar(ical_subcomponent))
 
-        xml_properties = self.properties
         if xml_properties is not None:
             if xml_properties == AllProperties():
                 for ical_property in component.properties():

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