Commit 9ac7d282 authored by Vincent Pelletier's avatar Vincent Pelletier

Rename operator into logical_operator to make the purpose clear.

Use explicitly logical_operator API on ComplexQuery.

git-svn-id: 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 2ce7cccc
......@@ -1935,11 +1935,11 @@ class Catalog(Folder,
subquery = self._buildQueryFromAbstractSyntaxTreeNode(subnode, search_key)
if subquery is not None:
operator = node.getLogicalOperator()
logical_operator = node.getLogicalOperator()
for comparison_operator, value_list in value_dict.iteritems():
append(search_key.buildQuery(value_list, comparison_operator=comparison_operator, logical_operator=operator))
if operator == 'not' or len(query_list) > 1:
result = ComplexQuery(query_list, operator=operator)
append(search_key.buildQuery(value_list, comparison_operator=comparison_operator, logical_operator=logical_operator))
if logical_operator == 'not' or len(query_list) > 1:
result = ComplexQuery(query_list, logical_operator=logical_operator)
elif len(query_list) == 1:
result = query_list[0]
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment