Fixed issue with sqlrepos variable (finally!)

NAMESPACE

@@ -1,25 +1,25 @@
-export(adjustedTableLaTeX)
-export(cacheQuery)
-export(createLocalRepos)
-export(demographics)
-export(execQuery)
-export(getAge)
-export(getAgeGroups)
-export(getAgeGroupsIPEDS)
-export(getParameters)
-export(getQueries)
-export(getQuery)
-export(getQueryDesc)
-export(getSQLRepos)
-export(local.available.packages)
-export(local.install.packages)
-export(lsos)
-export(pie)
-export(saveIPEDStoDB)
-export(setSQLRepos)
-export(updateLocalRepos)
-export(xtable.demographics)
-import(ggplot2)
-import(reshape)
-import(tools)
-S3method(xtable,demographics)
+S3method(xtable,demographics)
+export(adjustedTableLaTeX)
+export(cacheQuery)
+export(createLocalRepos)
+export(demographics)
+export(execQuery)
+export(getAge)
+export(getAgeGroups)
+export(getAgeGroupsIPEDS)
+export(getParameters)
+export(getQueries)
+export(getQuery)
+export(getQueryDesc)
+export(getSQLRepos)
+export(local.available.packages)
+export(local.install.packages)
+export(lsos)
+export(pie)
+export(saveIPEDStoDB)
+export(setSQLRepos)
+export(updateLocalRepos)
+export(xtable.demographics)
+import(ggplot2)
+import(reshape)
+import(tools)

R/dbaccess.R

@@ -2,15 +2,22 @@
 #' @author Jason Bryer <jbryer@@excelsior.edu>
 #' @export
 getSQLRepos <- function() {
+ 	pkgEnv <- pos.to.env(match('package:irutils', search()))
+ 	sqlrepos <- get("sqlrepos", envir=pkgEnv)
+ 	if(is.null(sqlrepos)) {
+ 		sqlrepos <- paste(system.file(package='irutils'), '/data', sep='')
+ 	}
 	return(sqlrepos)
 }
 
 #' Sets the current directory containing SQL files.
 #' @author Jason Bryer <jbryer@@excelsior.edu>
 #' @export
 setSQLRepos <- function(repos) {
-	#utils::assignInNamespaceassignInNamespace("sqlrepos", repos, "irutils")
-	sqlrepos <<- repos 
+ 	pkgEnv = pos.to.env(match('package:irutils', search()))
+ 	assign("sqlrepos", 
+ 							 value=paste(system.file(package='irutils'), '/data', sep=''), 
+ 							 envir=pkgEnv)
 }
 
 #' Returns a list of available queries in the current repository.

R/irutils-package.R

@@ -25,14 +25,15 @@ NULL
 #' @keywords datasets
 NULL
 
-#sqlrepos <- NULL
 cranMain <- 'http://cran.r-project.org' #Main CRAN
 cranExtra <- 'http://www.stats.ox.ac.uk/pub/RWin' #Windows Binaries for some packages
-geolite.location <- data.frame()
-geolite.blocks <- data.frame()
+#geolite.location <- data.frame()
+#geolite.blocks <- data.frame()
 
 .onAttach <- function(libname, pkgname) {
-	#pkgEnv = pos.to.env(match('package:irutils', search()))
-	#utils::assignInNamespace("sqlrepos", paste(system.file(package='irutils'), '/data', sep=''), "irutils")
-	sqlrepos <<- NULL
+ 	pkgEnv = pos.to.env(match('package:irutils', search()))
+ 	assign("sqlrepos", 
+ 							 value=paste(system.file(package='irutils'), '/data', sep=''), 
+ 							 envir=pkgEnv)
+	#sqlrepos <<- NULL
 }