[CalendarServer-changes] [4432] CalendarServer/trunk/twistedcaldav

[source_changes at macosforge.org]

Revision: 4432
          http://trac.macosforge.org/projects/calendarserver/changeset/4432
Author:   cdaboo at apple.com
Date:     2009-07-08 10:52:35 -0700 (Wed, 08 Jul 2009)
Log Message:
-----------
Make sure ignoreInvalidInstances is always true when expanding instances for data already on the server.

Modified Paths:
--------------
    CalendarServer/trunk/twistedcaldav/caldavxml.py
    CalendarServer/trunk/twistedcaldav/method/report_common.py
    CalendarServer/trunk/twistedcaldav/scheduling/processing.py

Modified: CalendarServer/trunk/twistedcaldav/caldavxml.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/caldavxml.py	2009-07-07 18:47:58 UTC (rev 4431)
+++ CalendarServer/trunk/twistedcaldav/caldavxml.py	2009-07-08 17:52:35 UTC (rev 4432)
@@ -956,9 +956,9 @@
                     instances = None
                 else:
                     # Expand the instances up to infinity
-                    instances = component.expandTimeRanges(datetime.datetime(2100, 1, 1, 0, 0, 0, tzinfo=utc))
+                    instances = component.expandTimeRanges(datetime.datetime(2100, 1, 1, 0, 0, 0, tzinfo=utc), ignoreInvalidInstances=True)
             else:
-                instances = component.expandTimeRanges(maxend)
+                instances = component.expandTimeRanges(maxend, ignoreInvalidInstances=True)
         else:
             instances = None
         self.children[0].setInstances(instances)

Modified: CalendarServer/trunk/twistedcaldav/method/report_common.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/method/report_common.py	2009-07-07 18:47:58 UTC (rev 4431)
+++ CalendarServer/trunk/twistedcaldav/method/report_common.py	2009-07-08 17:52:35 UTC (rev 4432)
@@ -416,7 +416,7 @@
     """
     
     # Expand out the set of instances for the event with in the required range
-    instances = calendar.expandTimeRanges(timerange.end)
+    instances = calendar.expandTimeRanges(timerange.end, ignoreInvalidInstances=True)
     
     # Can only do timed events
     for key in instances:
@@ -566,7 +566,7 @@
             
     # Then we expand each uid set separately
     for componentSet in uidmap.itervalues():
-        instances = InstanceList()
+        instances = InstanceList(ignoreInvalidInstances=True)
         instances.expandTimeRanges(componentSet, timerange.end)
         
         # Now convert instances into period list

Modified: CalendarServer/trunk/twistedcaldav/scheduling/processing.py
===================================================================
--- CalendarServer/trunk/twistedcaldav/scheduling/processing.py	2009-07-07 18:47:58 UTC (rev 4431)
+++ CalendarServer/trunk/twistedcaldav/scheduling/processing.py	2009-07-08 17:52:35 UTC (rev 4432)
@@ -446,7 +446,7 @@
         # First expand current one to get instances (only go 1 year into the future)
         default_future_expansion_duration = datetime.timedelta(days=356*1)
         expand_max = datetime.date.today() + default_future_expansion_duration
-        instances = calendar.expandTimeRanges(expand_max)
+        instances = calendar.expandTimeRanges(expand_max, ignoreInvalidInstances=True)
         instance_states = dict([(instance, True) for instance in instances.instances.itervalues()])
         
         # Extract UID from primary component as we want to ignore this one if we match it
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20090708/ed74435b/attachment.html>