[rkward-cvs] SF.net SVN: rkward:[3719] trunk/rkward/rkward/rbackend/rpackages/rkward/R/ internal.R

[m-eik at users.sourceforge.net]

Revision: 3719
          http://rkward.svn.sourceforge.net/rkward/?rev=3719&view=rev
Author:   m-eik
Date:     2011-08-10 13:34:16 +0000 (Wed, 10 Aug 2011)

Log Message:
-----------
simplified .rk.find.package.pluginmaps() by using system.file()

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R	2011-08-09 19:39:05 UTC (rev 3718)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/internal.R	2011-08-10 13:34:16 UTC (rev 3719)
@@ -75,14 +75,13 @@
 	.Call ("rk.do.generic.request", c (x, args), isTRUE (synchronous))
 }
 
-".rk.find.package.pluginmaps" <- function (lib.path, package, all.maps=FALSE) {
+".rk.find.package.pluginmaps" <- function (package, all.maps=FALSE) {
 	if(isTRUE(all.maps)){
 		# look for all pluginmaps in the rkward folder
-		pluginmaps <- dir(file.path(lib.path, package, "rkward"), pattern="*.pluginmap", full.names=TRUE)
+		pluginmaps <- dir(system.file("rkward", package=package), pattern="*.pluginmap", full.names=TRUE)
 	} else {
 		# check if a main .pluginmap file is provided
-		checkForPluginmaps <- file.path(lib.path, package, "rkward", paste(package, ".pluginmap", sep=""))
-		pluginmaps <- ifelse(file_test("-f", checkForPluginmaps), checkForPluginmaps, "")
+		pluginmaps <- system.file(file.path("rkward", paste(package, ".pluginmap", sep="")), package=package)
 	}
 	return(pluginmaps)
 }
@@ -93,7 +92,7 @@
 	x <- as.data.frame(installed.packages(fields="Title"))
 	# does a package enhance RKWard, i.e. provide plugins?
 	enhance.rk <- ifelse(is.na(x$Enhances), FALSE, grepl("rkward", x$Enhances))
-	pluginmaps <- ifelse(enhance.rk, .rk.find.package.pluginmaps(x$LibPath, x$Package), "")
+	pluginmaps <- ifelse(enhance.rk, .rk.find.package.pluginmaps(x$Package), "")
 	return(list(Package=as.character(x$Package), Title=as.character(x$Title), 
 		Version=as.character(x$Version), LibPath=as.character(x$LibPath),
 		EnhanceRK=as.logical(enhance.rk), Plugins=as.character(pluginmaps)))


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.