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

Merge branch 'lfilter' into table-error

parents be1bca74 49a973b1
No related branches found
No related tags found
1 merge request!22Release 0.3
__pycache__
.tox
.eggs
.coverage
*cache.db
*.egg-info
.docker/cert
src/caosadvancedtools/version.py
......@@ -224,8 +224,8 @@ class Crawler(object):
msg = ("The crawler has no matching rules for and is thus "
"ignoring:\n{}".format(item))
logging.warning(msg, extra={"identifier": str(item),
'category': "matches"})
logger.warning(msg, extra={"identifier": str(item),
'category': "matches"})
if len(matches[idx]) > 1:
msg = ("Attention: More than one matching cfood!\n"
......@@ -233,8 +233,8 @@ class Crawler(object):
+ "\tRecordTypes:\t" + ", ".join(
matches[idx])+"\n")
logging.warning(msg, extra={"identifier": str(item),
'category': "matches"})
logger.warning(msg, extra={"identifier": str(item),
'category': "matches"})
def cached_find_identifiables(self, identifiables):
if self.use_cache:
......
......@@ -75,7 +75,8 @@ class TSV_Importer(object):
class XLS_Importer(object):
def __init__(self, converters, obligatory_columns=[], unique_columns=[]):
def __init__(self, converters, obligatory_columns=None, unique_columns=None):
"""
converters: dict with column names as keys and converter functions as
values
......@@ -89,8 +90,8 @@ class XLS_Importer(object):
"""
self.sup = SuppressKnown()
self.required_columns = list(converters.keys())
self.obligatory_columns = obligatory_columns
self.unique_columns = unique_columns
self.obligatory_columns = [] if obligatory_columns is None else obligatory_columns
self.unique_columns = [] if unique_columns is None else unique_columns
self.converters = converters
def read_xls(self, filename):
......@@ -161,9 +162,9 @@ class XLS_Importer(object):
df = df.copy()
uniques = []
for index, row in df.iterrows():
element = tuple(row.loc[key] for key in self.unique_columns)
subtable = df[list(self.unique_columns)]
for index, row in subtable.iterrows():
element = tuple(row)
if element in uniques:
errmsg = (
"The {}. row contains the values '{}'.\nThis value "
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment