[CalendarServer-changes] [2094]
CalendarServer/branches/users/cdaboo/private_events-2081/
twistedcaldav/query/calendarquery.py
source_changes at macosforge.org
source_changes at macosforge.org
Tue Jan 8 13:29:22 PST 2008
Revision: 2094
http://trac.macosforge.org/projects/calendarserver/changeset/2094
Author: cdaboo at apple.com
Date: 2008-01-08 13:29:20 -0800 (Tue, 08 Jan 2008)
Log Message:
-----------
Cannot do index queries where the query is for a property on the VCALENDAR object.
Modified Paths:
--------------
CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/query/calendarquery.py
Modified: CalendarServer/branches/users/cdaboo/private_events-2081/twistedcaldav/query/calendarquery.py
===================================================================
--- 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]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/calendarserver-changes/attachments/20080108/ebe78696/attachment.html
More information about the calendarserver-changes
mailing list