[CalendarServer-changes] [2963] CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav /static.py

[source_changes at macosforge.org]

Revision: 2963
          http://trac.macosforge.org/projects/calendarserver/changeset/2963
Author:   wsanchez at apple.com
Date:     2008-09-09 14:54:14 -0700 (Tue, 09 Sep 2008)
Log Message:
-----------
Only one VTIMEZONE object, please.

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

Modified: CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/static.py
===================================================================
--- CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/static.py	2008-09-09 21:53:48 UTC (rev 2962)
+++ CalendarServer/branches/release/CalendarServer-1.3-dev/twistedcaldav/static.py	2008-09-09 21:54:14 UTC (rev 2963)
@@ -184,6 +184,7 @@
             filteredaces = filteredaces.getResult()
 
             # Must verify ACLs which means we need a request object at this point
+            tzids = set()
             for name, uid, type in self.index().search(None): #@UnusedVariable
                 try:
                     child = waitForDeferred(request.locateChildResource(self, name))
@@ -205,6 +206,14 @@
                     assert subcalendar.name() == "VCALENDAR"
 
                     for component in subcalendar.subcomponents():
+                        
+                        # Only insert VTIMEZONEs once
+                        if component.name() == "VTIMEZONE":
+                            tzid = component.propertyValue("TZID")
+                            if tzid in tzids:
+                                continue
+                            tzids.add(tzid)
+
                         calendar.addComponent(component)
                         
             yield calendar
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080909/0a18b130/attachment-0001.html