From 54178543d6d25359d8478ac14c86b0f38e5eb59c Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Sun, 21 Nov 2021 17:25:09 -0800 Subject: [PATCH] Fix Row Filtering Part 3 (#1450) Graak! Why I can't get my code translated into yours is beyond me; this time for sure. --- src/gam/display.py | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/gam/display.py b/src/gam/display.py index c6b6cce1..b5c29447 100644 --- a/src/gam/display.py +++ b/src/gam/display.py @@ -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