[CalendarServer-changes] [1438] CalendarServer/branches/users/cdaboo/fast-multiget-1425/ twistedcaldav/method

[source_changes at macosforge.org]

Revision: 1438
          http://trac.macosforge.org/projects/calendarserver/changeset/1438
Author:   cdaboo at apple.com
Date:     2007-03-30 13:37:28 -0700 (Fri, 30 Mar 2007)

Log Message:
-----------
Provide another return parameter so that the caller knows whether any calendar-data element was requested.

Modified Paths:
--------------
    CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_common.py
    CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py

Modified: CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_common.py	2007-03-30 20:36:28 UTC (rev 1437)
+++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_common.py	2007-03-30 20:37:28 UTC (rev 1438)
@@ -193,14 +193,16 @@
     
     result = True
     message = ""
+    generate_calendar_data = False
     for property in prop.children:
         if isinstance(property, caldavxml.CalendarData):
             if not property.verifyTypeVersion([("text/calendar", "2.0")]):
                 result = False
                 message = "Calendar-data element type/version not supported: content-type: %s, version: %s" % (property.content_type,property.version)
+            generate_calendar_data = True
             break
 
-    return result, message
+    return result, message, generate_calendar_data
 
 def _namedPropertiesForResource(request, props, resource, calendar=None):
     """

Modified: CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py
===================================================================
--- CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py	2007-03-30 20:36:28 UTC (rev 1437)
+++ CalendarServer/branches/users/cdaboo/fast-multiget-1425/twistedcaldav/method/report_multiget.py	2007-03-30 20:37:28 UTC (rev 1438)
@@ -64,15 +64,17 @@
     
     if propertyreq.qname() == ("DAV:", "allprop"):
         propertiesForResource = report_common.allPropertiesForResource
+        generate_calendar_data = False
 
     elif propertyreq.qname() == ("DAV:", "propname"):
         propertiesForResource = report_common.propertyNamesForResource
+        generate_calendar_data = False
 
     elif propertyreq.qname() == ("DAV:", "prop"):
         propertiesForResource = report_common.propertyListForResource
         
         # Verify that any calendar-data element matches what we can handle
-        result, message = report_common.validPropertyListCalendarDataTypeVersion(propertyreq)
+        result, message, generate_calendar_data = report_common.validPropertyListCalendarDataTypeVersion(propertyreq)
         if not result:
             log.err(message)
             raise HTTPError(ErrorResponse(responsecode.FORBIDDEN, (caldav_namespace, "supported-calendar-data")))

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