From cc66ea8e99f809c53cb5a23430b814f68efdb126 Mon Sep 17 00:00:00 2001 From: Johannes Ranke Date: Wed, 7 Oct 2015 17:19:21 +0200 Subject: Maintenance changes for the release of 0.6.4 --- R/checkexperiment.R | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) (limited to 'R/checkexperiment.R') diff --git a/R/checkexperiment.R b/R/checkexperiment.R index 2bf0ce7..8c2f472 100644 --- a/R/checkexperiment.R +++ b/R/checkexperiment.R @@ -9,7 +9,11 @@ checkexperiment <- function(id, db = "ecotox", endpoint = "%") if (!(db %in% rownames(databases))) stop("Database is not supported") - channel <- odbcConnect(db,uid="cytotox",pwd="cytotox",case="tolower") + if (requireNamespace("RODBC")) { + channel <- RODBC::odbcConnect(db, uid="cytotox", pwd="cytotox", case="tolower") + } else { + stop("For this function, the RODBC package has to be installed and configured.") + } responsename = as.character(databases[db,1]) @@ -19,7 +23,7 @@ checkexperiment <- function(id, db = "ecotox", endpoint = "%") exptable <- paste(exptype, "s", sep="") commentquery <- paste("SELECT comment FROM ", exptable , " WHERE ", exptype, " = ", id) - commentdata <- sqlQuery(channel,commentquery) + commentdata <- RODBC::sqlQuery(channel,commentquery) comment <- as.character(commentdata[[1]]) expquery <- paste("SELECT experimentator,substance, ", @@ -32,15 +36,15 @@ checkexperiment <- function(id, db = "ecotox", endpoint = "%") endpoint, "'", sep = "") } - expdata <- sqlQuery(channel,expquery) + expdata <- RODBC::sqlQuery(channel,expquery) if (db %in% c("cytotox","enzymes")) { controlquery <- paste("SELECT type,response FROM controls WHERE plate=",id) - controldata <- sqlQuery(channel,controlquery) + controldata <- RODBC::sqlQuery(channel,controlquery) } - odbcClose(channel) + RODBC::odbcClose(channel) op <- par(ask=TRUE) on.exit(par(op)) -- cgit v1.2.1