From 9f807d5d766cb55ef9dae1627d55e3620c46b9ae Mon Sep 17 00:00:00 2001 From: Mikko Marttila <13412395+mikmart@users.noreply.github.com> Date: Sun, 21 Jan 2024 10:58:55 +0000 Subject: [PATCH] Refactor comments --- R/searchbuilder.R | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/R/searchbuilder.R b/R/searchbuilder.R index 1737271b..7dba9414 100644 --- a/R/searchbuilder.R +++ b/R/searchbuilder.R @@ -1,7 +1,7 @@ # server-side processing for the SearchBuilder extension # https://datatables.net/extensions/searchbuilder/ -# returns NULL if the search doesn't contain any valid conditions +# returns NULL if none of the search criteria are valid sbEvaluateSearch = function(search, data) { # https://datatables.net/reference/option/searchBuilder.preDefined stopifnot(search$logic %in% c('AND', 'OR')) @@ -24,10 +24,11 @@ sbEvaluateCriteria = function(criteria, data) { v = sbParseValue(sbExtractValue(criteria), type) sbEvaluateCondition(cond, type, x, v) } else { - # skip evaluating invalid conditions + # just return NULL for criteria with an invalid condition } } +# check that condition is present and values are non-empty sbHasValidCondition = function(criteria) { 'condition' %in% names(criteria) && all(sapply(criteria, nzchar)) }