Modified: CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/query/calendarquery.py (2093 => 2094)

--- CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/query/calendarquery.py	2008-01-07 22:17:17 UTC (rev 2093)
+++ CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/query/calendarquery.py	2008-01-08 21:29:20 UTC (rev 2094)
@@ -57,6 +57,10 @@
     assert vcalfilter.filter_name == "VCALENDAR"
     
     if len(vcalfilter.children) > 0:
+        # Only comp-filters are handled
+        for _ignore in [x for x in vcalfilter.children if not isinstance(x, caldavxml.ComponentFilter)]:
+            raise ValueError
+        
         return compfilterListExpression(vcalfilter.children)
     else:
         return expression.allExpression()
@@ -111,7 +115,7 @@
         
     # Handle embedded components - we do not right now as our Index does not handle them
     comps = []
-    for c in [x for x in compfilter.filters if isinstance(x, caldavxml.ComponentFilter)]:
+    for _ignore in [x for x in compfilter.filters if isinstance(x, caldavxml.ComponentFilter)]:
         raise ValueError
     if len(comps) > 1:
         compsExpression = expression.orExpression[comps]
@@ -162,7 +166,7 @@
     
     # Handle embedded parameters - we do not right now as our Index does not handle them
     params = []
-    for p in propfilter.filters:
+    for _ignore in propfilter.filters:
         raise ValueError
     if len(params) > 1:
         paramsExpression = expression.orExpression[params]