[CalendarServer-changes] [2372] CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav /caldavxml.py

[source_changes at macosforge.org]

Revision: 2372
          http://trac.macosforge.org/projects/calendarserver/changeset/2372
Author:   wsanchez at apple.com
Date:     2008-05-06 07:20:14 -0700 (Tue, 06 May 2008)

Log Message:
-----------
Pull up 2370: Calendar query empty <comp> element process is wrong
Fixes #187

Modified Paths:
--------------
    CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/caldavxml.py

Modified: CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/caldavxml.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/caldavxml.py	2008-05-06 02:26:53 UTC (rev 2371)
+++ CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/caldavxml.py	2008-05-06 14:20:14 UTC (rev 2372)
@@ -797,6 +797,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():
@@ -807,7 +814,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/20080506/d14ab9a1/attachment.html