Skip to content
Snippets Groups Projects
Verified Commit 23f1311a authored by Timm Fitschen's avatar Timm Fitschen
Browse files

Merge branch 'lfilter' into table-error

parents e34a9c26 616d6c3b
No related branches found
No related tags found
1 merge request!22Release 0.3
...@@ -138,7 +138,7 @@ class Crawler(object): ...@@ -138,7 +138,7 @@ class Crawler(object):
if current_xml != old: if current_xml != old:
continue continue
new_cont.update() new_cont.update(unique=False)
def collect_cfoods(self): def collect_cfoods(self):
""" """
...@@ -541,18 +541,17 @@ carefully and if the changes are ok, click on the following link: ...@@ -541,18 +541,17 @@ carefully and if the changes are ok, click on the following link:
used for the match. used for the match.
""" """
if entity.name is None:
# TODO multiple parents are ignored! Sufficient? # TODO multiple parents are ignored! Sufficient?
query_string = "FIND Record " + entity.get_parents()[0].name query_string = "FIND Record " + entity.get_parents()[0].name
query_string += " WITH " query_string += " WITH "
if entity.name is not None:
query_string += "name='{}' AND".format(entity.name)
for p in entity.get_properties(): for p in entity.get_properties():
query_string += ("'" + p.name + "'='" + str(get_value(p)) query_string += ("'" + p.name + "'='" + str(get_value(p))
+ "' AND ") + "' AND ")
# remove the last AND # remove the last AND
query_string = query_string[:-4] query_string = query_string[:-4]
else:
query_string = "FIND '{}'".format(entity.name)
logger.debug(query_string) logger.debug(query_string)
q = db.Query(query_string) q = db.Query(query_string)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment