From a8b7ab73a5df4fdf6cac5bad052b9ed77138fc86 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 12 Dec 2018 10:22:30 +0100 Subject: Add whereClause argument to checkexperiment --- DESCRIPTION | 4 +- GNUmakefile | 13 +++ R/checkexperiment.R | 4 +- README.html | 209 ++++++++++++++++++++++++++++++++++++++++++++++--- README.md | 4 +- check.log | 11 +-- man/checkexperiment.Rd | 10 ++- 7 files changed, 227 insertions(+), 28 deletions(-) diff --git a/DESCRIPTION b/DESCRIPTION index 78917dc..2c09951 100644 --- a/DESCRIPTION +++ b/DESCRIPTION @@ -1,6 +1,6 @@ Package: drfit -Version: 0.7.2 -Date: 2018-10-11 +Version: 0.7.3 +Date: 2018-12-12 Title: Dose-Response Data Evaluation Authors@R: person("Johannes", "Ranke", email = "jranke@uni-bremen.de", role = c("aut", "cre"), diff --git a/GNUmakefile b/GNUmakefile index 2f8f38c..760dec8 100644 --- a/GNUmakefile +++ b/GNUmakefile @@ -34,3 +34,16 @@ winbuilder: build curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-release/ @echo "Uploading to R-devel on win-builder" curl -T $(TGZ) ftp://anonymous@win-builder.r-project.org/R-devel/ + +drat: build + "$(RBIN)/Rscript" -e "drat::insertPackage('$(TGZ)', commit = TRUE)" + +$(WINBIN): build + @echo "Building windows binary package..." + "$(RBIN)/R" CMD INSTALL $(TGZ) --build + @echo "DONE." + +winbin: $(WINBIN) + +dratwin: winbin + "$(RBIN)/Rscript" -e "drat::insertPackage('$(WINBIN)', 'e:/git/drat/', commit = TRUE)" diff --git a/R/checkexperiment.R b/R/checkexperiment.R index 865d678..0715fc2 100644 --- a/R/checkexperiment.R +++ b/R/checkexperiment.R @@ -2,7 +2,7 @@ utils::globalVariables(c("type", "conc", "substance")) checkexperiment <- function(id, db = c("ecotox", "cytotox", "enzymes"), - endpoint = "%") + endpoint = "%", whereClause = "1") { db = match.arg(db) @@ -34,7 +34,7 @@ checkexperiment <- function(id, "WHERE ", exptype, "=", id) if (db == "ecotox") { - expquery <- paste0(expquery, " AND type LIKE '", endpoint, "'") + expquery <- paste0(expquery, " AND type LIKE '", endpoint, "' AND ", whereClause) } expdata <- dbGetQuery(con, expquery) diff --git a/README.html b/README.html index f4188f1..0a5165d 100644 --- a/README.html +++ b/README.html @@ -11,17 +11,202 @@ - +Readme file for the drfit R package - + - - - - - - - + + + + + + +