Fix broken filter

rundel · Mar 6, 2024 · 7a5b907 · 7a5b907
1 parent 5b6c255
commit 7a5b907
Showing 1 changed file with 21 additions and 15 deletions.
diff --git a/R/util_filter.R b/R/util_filter.R
@@ -1,23 +1,29 @@
-filter_results = function(res, col, pattern = NULL, exclude = FALSE) {
+filter_results = function(res, pattern = NULL, exclude = FALSE, col = NULL) {
   UseMethod("filter_results", res)
 }
 
 #' @exportS3Method
-filter_results.default = function(res, col, pattern = NULL, exclude = FALSE) {
-  if (!is.null(pattern)) {
-    subset = grepl(pattern, res)
-    if (exclude) res = res[!subset]
-    else         res = res[subset]
-  }
-  res
+filter_results.default = function(res, pattern = NULL, exclude = FALSE, col = NULL) {
+  if (is.null(pattern))
+    return(res)
+
+  subset = grepl(pattern, res)
+  if (exclude)
+    res[!subset]
+  else
+    res[subset]
 }
 
 #' @exportS3Method
-filter_results.data.frame = function(res, col, pattern = NULL, exclude = FALSE) {
-  if (!is.null(pattern)) {
-    subset = grepl(pattern, res[[col]])
-    if (exclude) res = res[!subset,]
-    else         res = res[subset,]
-  }
-  res
+filter_results.data.frame = function(res, pattern = NULL, exclude = FALSE, col = NULL) {
+  if (is.null(pattern))
+    return(res)
+
+  stopifnot(!is.null(col))
+
+  subset = grepl(pattern, res[[col]])
+  if (exclude)
+    res[!subset,]
+  else
+    res[subset,]
 }