Reexport Rlabkey::makeFilter

ropensci · Dec 14, 2018 · 3c46588 · 3c46588
1 parent de9a65d
commit 3c46588
Show file tree

Hide file tree

Showing 7 changed files with 103 additions and 51 deletions.
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -30,4 +30,4 @@ Suggests:
     knitr,
     pryr
 VignetteBuilder: knitr
-RoxygenNote: 6.1.0
+RoxygenNote: 6.1.1
diff --git a/NAMESPACE b/NAMESPACE
@@ -2,6 +2,7 @@
 
 export(checkNetrc)
 export(connectDS)
+export(makeFilter)
 export(writeNetrc)
 importFrom(R6,R6Class)
 importFrom(Rlabkey,getSession)

diff --git a/R/DataSpaceStudy.R b/R/DataSpaceStudy.R
@@ -105,7 +105,7 @@
 #' }
 #' @docType class
 #' @importFrom digest digest
-#' @importFrom Rlabkey labkey.getQueryDetails labkey.executeSql makeFilter
+#' @importFrom Rlabkey labkey.getQueryDetails labkey.executeSql
 DataSpaceStudy <- R6Class(
   classname = "DataSpaceStudy",
   public = list(

diff --git a/R/helpers.R b/R/helpers.R
@@ -222,3 +222,7 @@ makeCountQuery <- function(dataset, group) {
 
   query
 }
+
+#' @importFrom Rlabkey makeFilter
+#' @export
+Rlabkey::makeFilter
diff --git a/man/reexports.Rd b/man/reexports.Rd
diff --git a/vignettes/Intro_to_DataSpaceR.Rmd b/vignettes/Intro_to_DataSpaceR.Rmd
@@ -96,7 +96,6 @@ knitr::kable(cvd256$getVariableInfo("NAb"))
 To get only a subset of the data and speed up the download, filters can be passed to `getDataset`. The filters are created using the `makeFilter` function of the `Rlabkey` package.
 
 ```{r getDataset-filter}
-library(Rlabkey)
 cvd256Filter <- makeFilter(c("visit_day", "EQUAL", "0"))
 NAb_day0 <- cvd256$getDataset("NAb", colFilter = cvd256Filter)
 dim(NAb_day0)

diff --git a/vignettes/Intro_to_DataSpaceR.html b/vignettes/Intro_to_DataSpaceR.html