Skip to content

Incorporate new filter types for Array (Multi-value text choice) fields #124

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
XingY wants to merge 1 commit into
base: develop
Choose a base branch
from
+23 −3
Open

Incorporate new filter types for Array (Multi-value text choice) fields #124

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Rlabkey/DESCRIPTION
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Package: Rlabkey
Version: 3.4.5
Date: 2026-01-20
Version: 3.4.6
Date: 2026-02-17
Title: Data Exchange Between R and 'LabKey' Server
Authors@R: c(person(given = "Peter",
family = "Hussey",
Expand Down
3 changes: 3 additions & 0 deletions Rlabkey/NEWS
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
Changes in 3.4.6
o Incorporate new filter types for Array (Multi-value text choice) fields

Changes in 3.4.5
o Switch to using path first URLs for LabKey server requests.
o Utilize httr to generate request query parameters.
Expand Down
10 changes: 10 additions & 0 deletions Rlabkey/R/makeFilter.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,13 @@ makeFilter <- function(..., asList=FALSE)
# These operators require a data value
#

# Array-valued column operators
"ARRAY_CONTAINS_ALL"="arraycontainsall",
"ARRAY_CONTAINS_ANY"="arraycontainsany",
"ARRAY_CONTAINS_EXACT"="arraymatches",
"ARRAY_CONTAINS_NOT_EXACT"="arraynotmatches",
"ARRAY_CONTAINS_NONE"="arraycontainsnone",

"EQUALS"="eq",
"EQUAL"="eq",
"DATE_EQUAL"="dateeq",
Expand Down Expand Up @@ -90,6 +97,9 @@ makeFilter <- function(..., asList=FALSE)
# These are the "no data value" operators
#

"ARRAY_ISEMPTY"="arrayisempty",
"ARRAY_ISNOTEMPTY"="arrayisnotempty",

"ISBLANK"="isblank",
"IS_MISSING"="isblank",
"MISSING"="isblank",
Expand Down
9 changes: 8 additions & 1 deletion Rlabkey/man/makeFilter.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,13 @@ the column name, operator and value.
}

Operator values:\cr
ARRAY_CONTAINS_ALL\cr
ARRAY_CONTAINS_ANY\cr
ARRAY_CONTAINS_EXACT\cr
ARRAY_CONTAINS_NOT_EXACT\cr
ARRAY_CONTAINS_NONE\cr
ARRAY_ISEMPTY\cr
ARRAY_ISNOTEMPTY\cr
EQUAL\cr
DATE_EQUAL\cr
NOT_EQUAL\cr
Expand Down Expand Up @@ -58,7 +65,7 @@ EXP_CHILD_OF\cr
EXP_PARENT_OF\cr
EXP_LINEAGE_OF\cr

When using the MISSING, NOT_MISSING, MV_INDICATOR, or NO_MV_INDICATOR operators, an empty string should be supplied as the value.
When using the MISSING, NOT_MISSING, MV_INDICATOR, NO_MV_INDICATOR, ARRAY_ISEMPTY, or ARRAY_ISNOTEMPTY operators, an empty string should be supplied as the value.
See example below.
}

Expand Down