Fix Row Filtering Part 3 (#1450)

Graak! Why I can't get my code translated into yours is beyond me; this time for sure.
This commit is contained in:
Ross Scroggs
2021-11-21 17:25:09 -08:00
committed by GitHub
parent 5436f21bc0
commit 54178543d6

View File

@ -183,6 +183,12 @@ def write_csv_file(csvRows, titles, list_type, todrive):
return False
return True
def rowDropFilterMatch(filters, columns, row):
for c, filterVal in iter(filters.items()):
if filterMatch(filterVal, columns[c], row):
return True
return False
if GC_Values[GC_CSV_ROW_FILTER] or GC_Values[GC_CSV_ROW_DROP_FILTER]:
if GC_Values[GC_CSV_ROW_FILTER]:
keepColumns = {}
@ -215,7 +221,7 @@ def write_csv_file(csvRows, titles, list_type, todrive):
if (((keepColumns is None) or
rowFilterMatch(GC_Values[GC_CSV_ROW_FILTER], keepColumns, row)) and
((dropColumns is None) or
not rowFilterMatch(GC_Values[GC_CSV_ROW_DROP_FILTER], dropColumns, row))):
not rowDropFilterMatch(GC_Values[GC_CSV_ROW_DROP_FILTER], dropColumns, row))):
rows.append(row)
csvRows = rows