aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--R/drfit.R18
1 files changed, 13 insertions, 5 deletions
diff --git a/R/drfit.R b/R/drfit.R
index f2480d2..fe76f86 100644
--- a/R/drfit.R
+++ b/R/drfit.R
@@ -1,5 +1,6 @@
drdata <- function(substances, experimentator = "%", db = "cytotox",
- celltype="IPC-81",enzymetype="AChE",whereClause="1",
+ celltype="IPC-81",enzymetype="AChE",
+ organism="Vibrio fischeri",endpoint="Luminescence",whereClause="1",
ok="'ok','no fit'")
{
library(RODBC)
@@ -10,18 +11,25 @@ drdata <- function(substances, experimentator = "%", db = "cytotox",
testtype <- "celltype"
type <- celltype
} else {
- responsetype <- "activity"
- testtype <- "enzyme"
- type <- enzymetype
+ if (db == "enzymes") {
+ responsetype <- "activity"
+ testtype <- "enzyme"
+ type <- enzymetype
+ } else {
+ responsetype <- "response"
+ testtype <- "organism"
+ type <- organism
+ }
}
query <- paste("SELECT conc,",responsetype,",unit,experimentator,substance,",testtype,
- ",plate,ok FROM ", db, " WHERE substance IN ('",
+ ",ok FROM ", db, " WHERE substance IN ('",
slist,"') AND experimentator LIKE '",
experimentator,"' AND ",testtype," LIKE '",
type,"' AND ",
whereClause," AND ok in (",
ok,")",sep="")
+ if (db == "ecotox") query <- paste(query," AND type LIKE '",endpoint,"'",sep="")
data <- sqlQuery(channel,query)
odbcClose(channel)
names(data)[[1]] <- "dose"

Contact - Imprint