Cyclone-Team/gramps
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Made select use proper recursive expressions; some optimizations

Browse Source
This commit is contained in:
Doug Blank 2016-01-11 17:19:14 -05:00
parent 8902d8f5de
commit 9d6d791e21
1 changed files with 40 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

65
gramps/gen/db/base.py
View File

@ -1949,6 +1949,43 @@ class DbWriteBase(DbReadBase):
else: else:
raise Exception("invalid select operator: '%s'" % op) raise Exception("invalid select operator: '%s'" % op)
return True if matched else False return True if matched else False
def evaluate_values(condition, item, db, table, env):
"""
Evaluates the names in all conditions.
"""
if len(condition) == 2: # ["AND"|"OR" [...]]
connector, exprs = condition
for expr in exprs:
evaluate_values(expr, item, db, table, env)
elif len(condition) == 3: # (name, op, value)
(name, op, value) = condition
# just the ones we need for filter
hname = hash_name(table, name)
if hname not in env:
value = item.get_field(name, db, ignore_errors=True)
env[hname] = value
def evaluate_truth(condition, item, db, table, env):
if len(condition) == 2: # ["AND"|"OR" [...]]
connector, exprs = condition
if connector == "AND": # all must be true
for expr in exprs:
if not evaluate_truth(expr, item, db, table, env):
return False
return True
elif connector == "OR": # any will return true
for expr in exprs:
if evaluate_truth(expr, item, db, table, env):
return True
return False
else:
raise Exception("No such connector: '%s'" % connector)
elif len(condition) == 3: # (name, op, value)
(name, op, value) = condition
v = env.get(hash_name(table, name))
return compare(v, op, value)
# Fields is None or list, maybe containing "*": # Fields is None or list, maybe containing "*":
if fields is None: if fields is None:
fields = ["*"] fields = ["*"]
@ -1972,31 +2009,9 @@ class DbWriteBase(DbReadBase):
item = self._tables[table]["handle_func"](handle) item = self._tables[table]["handle_func"](handle)
row = {} row = {}
env = {} env = {}
for (connector, exprs) in filter: # Go through all fliters and evaluate the fields:
for (name, op, value) in exprs: evaluate_values(filter, item, self, table, env)
# just the ones we need for filter matched = evaluate_truth(filter, item, self, table, env)
value = item.get_field(name, self, ignore_errors=True)
env[hash_name(table, name)] = value
for (connector, exprs) in filter:
if connector == "AND":
matched = True
# all must match to be true
for (name, op, value) in exprs:
v = eval(hash_name(table, name), env)
matched = compare(v, op, value)
if not matched:
break
elif connector == "OR":
matched = False
# any must match to be true
for (name, op, value) in exprs:
v = eval(hash_name(table, name), env)
matched = compare(v, op, value)
if matched:
break
if not matched:
break
# else, keep going
if matched: if matched:
if selected < limit and start <= position: if selected < limit and start <= position:
# now, we get all of the fields # now, we get all of the fields