Skip to content

Issue 48298: Align API Filter Operators #95

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

Merged
merged 2 commits into from
Aug 18, 2023
Merged

Issue 48298: Align API Filter Operators #95

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
3f054fd
Implement
RosalineP Aug 16, 2023
4bb90ad
update release note re: supported LK version
cnathe Aug 18, 2023
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: 2.11.0
Date: 2023-05-02
Version: 2.12.0
Date: 2023-08-18
Title: Data Exchange Between R and 'LabKey' Server
Author: Peter Hussey
Maintainer: Cory Nathe <[email protected]>
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 2.12.0
o Issue 48298: Add Lineage filter types to makeFilter

Changes in 2.11.0
o Add labkey.security.renameContainer
o Note: only supported for LabKey Server v23.5
Expand Down
19 changes: 13 additions & 6 deletions Rlabkey/R/makeFilter.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,17 +50,17 @@
"DATE_GT"="dategt",
"DATE_GREATER_THAN"="dategt",

"LT"="lt",
"LESS_THAN"="lt",
"DATE_LT"="datelt",
"DATE_LESS_THAN"="datelt",

"GTE"="gte",
"GREATER_THAN_OR_EQUAL_TO"="gte",
"GREATER_THAN_OR_EQUAL"="gte",
"DATE_GTE"="dategte",
"DATE_GREATER_THAN_OR_EQUAL"="dategte",

"LT"="lt",
"LESS_THAN"="lt",
"DATE_LT"="datelt",
"DATE_LESS_THAN"="datelt",

"LTE"="lte",
"LESS_THAN_OR_EQUAL_TO"="lte",
"LESS_THAN_OR_EQUAL"="lte",
Expand Down Expand Up @@ -110,10 +110,17 @@
"Q"="q",

#
# Ontology filters
# Ontology operators
#
"ONTOLOGY_IN_SUBTREE"="concept:insubtree",
"ONTOLOGY_NOT_IN_SUBTREE"="concept:notinsubtree",

#
# Lineage operators
#
"EXP_CHILD_OF" = "exp:childof",
"EXP_PARENT_OF" = "exp:parentof",
"EXP_LINEAGE_OF" = "exp:lineageof",
)

if(is.null(fop)==TRUE) stop ("Invalid operator name.")
Expand Down
4 changes: 2 additions & 2 deletions Rlabkey/man/Rlabkey-package.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,8 +18,8 @@ schema objects (\code{labkey.getSchema}).
\tabular{ll}{
Package: \tab Rlabkey\cr
Type: \tab Package\cr
Version: \tab 2.11.0\cr
Date: \tab 2023-05-02\cr
Version: \tab 2.12.0\cr
Date: \tab 2023-08-18\cr
License: \tab Apache License 2.0\cr
LazyLoad: \tab yes\cr
}
Expand Down
3 changes: 3 additions & 0 deletions Rlabkey/man/makeFilter.Rd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,9 @@ NO_MV_INDICATOR\cr
Q\cr
ONTOLOGY_IN_SUBTREE\cr
ONTOLOGY_NOT_IN_SUBTREE\cr
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.
See example below.
Expand Down