From 652ab1dc6db2b77b56f7fc975847a95e001f4957 Mon Sep 17 00:00:00 2001 From: Ross Scroggs Date: Thu, 22 May 2025 09:36:50 -0700 Subject: [PATCH] Fixed bug in `gam print filelist ... countsonly` --- src/GamCommands.txt | 2 +- src/GamUpdate.txt | 8 ++++++++ src/gam/__init__.py | 6 +++--- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/src/GamCommands.txt b/src/GamCommands.txt index 11df3333..cd9c12db 100644 --- a/src/GamCommands.txt +++ b/src/GamCommands.txt @@ -1876,7 +1876,7 @@ gam calendar moveevent (id|eventid )+ destination wipe gam calendar printevents * * [fields ] [showdayofweek] - [countsonly] + [countsonly [eventrowfilter]] [formatjson [quotechar ]] [todrive *] ::= diff --git a/src/GamUpdate.txt b/src/GamUpdate.txt index 07c68eb8..58b28a5d 100644 --- a/src/GamUpdate.txt +++ b/src/GamUpdate.txt @@ -1,3 +1,11 @@ +7.07.08 + +Fixed bug in `gam print filelist ... countsonly` that issued an +incorrect warning message like the following when `redirect csv multiprocess` was specified. +``` +WARNING: csv_output_row_filter column "^name$" does not match any output columns +``` + 7.07.07 Fixed bug in `gam report ... countsonly eventrowfilter` that issued an diff --git a/src/gam/__init__.py b/src/gam/__init__.py index 18977463..141290c0 100755 --- a/src/gam/__init__.py +++ b/src/gam/__init__.py @@ -25,7 +25,7 @@ https://github.com/GAM-team/GAM/wiki """ __author__ = 'GAM Team ' -__version__ = '7.07.07' +__version__ = '7.07.08' __license__ = 'Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)' #pylint: disable=wrong-import-position @@ -56231,9 +56231,9 @@ def printFileList(users): if not countsRowFilter: csvPFco.SetRowFilter([], GC.Values[GC.CSV_OUTPUT_ROW_FILTER_MODE]) if GM.Globals[GM.CSVFILE][GM.REDIRECT_QUEUE] is None: - csvPFco.writeCSVfile(f'{Cmd.Argument(GM.Globals[GM.ENTITY_CL_START])} {Cmd.Argument(GM.Globals[GM.ENTITY_CL_START]+1)} Drive File Counts') + csvPFco.writeCSVfile(f'{Cmd.Argument(GM.Globals[GM.ENTITY_CL_START])} {Cmd.Argument(GM.Globals[GM.ENTITY_CL_START]+1)} Drive File Counts', not countsRowFilter) else: - csvPFco.writeCSVfile('Drive File Counts') + csvPFco.writeCSVfile('Drive File Counts', not countsRowFilter) FILECOMMENTS_FIELDS_CHOICE_MAP = { 'action': 'action',