[rkward-cvs] SF.net SVN: rkward:[3851] trunk/rkward/rkward/rbackend/rpackages/rkwarddev

[m-eik at users.sourceforge.net]

Revision: 3851
          http://rkward.svn.sourceforge.net/rkward/?rev=3851&view=rev
Author:   m-eik
Date:     2011-09-27 17:18:19 +0000 (Tue, 27 Sep 2011)
Log Message:
-----------
rkwarddev: re-corrected varslot "types" again

Modified Paths:
--------------
    trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rk.XML.varslot.R
    trunk/rkward/rkward/rbackend/rpackages/rkwarddev/man/rk.XML.varslot.Rd

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rk.XML.varslot.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rk.XML.varslot.R	2011-09-27 16:50:22 UTC (rev 3850)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwarddev/R/rk.XML.varslot.R	2011-09-27 17:18:19 UTC (rev 3851)
@@ -17,7 +17,7 @@
 #' @param max.len The maximum length, an object needs to have. If \code{NULL}, defaults to the largest
 #'		integer number representable on the system.
 #' @param classes An optional character vector, defining class names to which the selection must be limited.
-#' @param type If you specify one or more variables types here, the varslot will only accept objects of those
+#' @param types If you specify one or more variables types here, the varslot will only accept objects of those
 #'		types. Valid types are "unknown", "number", "string", "factor", "invalid". Optional, use with great care,
 #'		the user should not be prevented from making valid choices, and rkward does not always know the type
 #'		of a variable!
@@ -36,7 +36,7 @@
 #' }
 
 rk.XML.varslot <- function(label, source, required=FALSE, multi=FALSE, min=1, any=1, max=0,
-	dim=0, min.len=0, max.len=NULL, classes=NULL, type=NULL, id.name="auto"){
+	dim=0, min.len=0, max.len=NULL, classes=NULL, types=NULL, id.name="auto"){
 	if(inherits(source, "XiMpLe.node")){
 		source.name <- source at name
 		if(!identical(source.name, "varselector")){
@@ -57,14 +57,14 @@
 	if(!is.null(classes)){
 		var.slot.attr[["classes"]] <- paste(classes, collapse=" ")
 	} else {}
-	if(!is.null(type)){
-		valid.types <- c("unknown", "numeric", "string", "factor", "invalid")
-		invalid.type <- !type %in% valid.types
+	if(!is.null(types)){
+		valid.types <- c("unknown", "number", "string", "factor", "invalid")
+		invalid.type <- !types %in% valid.types
 		if(invalid.type){
-			warning(paste("You provided invalid types for varslot, they were ignored: ", paste(type, collapse=", "), sep=""))
-			type <- ""
+			warning(paste("You provided invalid types for varslot, they were ignored: ", paste(types, collapse=", "), sep=""))
+			types <- ""
 		} else {}
-		var.slot.attr[["type"]] <- paste(type, collapse=" ")
+		var.slot.attr[["types"]] <- paste(types, collapse=" ")
 	} else {}
 	if(isTRUE(required)){
 		var.slot.attr[["required"]] <- "true"

Modified: trunk/rkward/rkward/rbackend/rpackages/rkwarddev/man/rk.XML.varslot.Rd
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkwarddev/man/rk.XML.varslot.Rd	2011-09-27 16:50:22 UTC (rev 3850)
+++ trunk/rkward/rkward/rbackend/rpackages/rkwarddev/man/rk.XML.varslot.Rd	2011-09-27 17:18:19 UTC (rev 3851)
@@ -4,7 +4,7 @@
 \usage{
   rk.XML.varslot(label, source, required = FALSE, multi =
   FALSE, min = 1, any = 1, max = 0, dim = 0, min.len = 0,
-  max.len = NULL, classes = NULL, type = NULL, id.name =
+  max.len = NULL, classes = NULL, types = NULL, id.name =
   "auto")
 }
 \arguments{
@@ -46,7 +46,7 @@
   \item{classes}{An optional character vector, defining
   class names to which the selection must be limited.}
 
-  \item{type}{If you specify one or more variables types
+  \item{types}{If you specify one or more variables types
   here, the varslot will only accept objects of those
   types. Valid types are "unknown", "number", "string",
   "factor", "invalid". Optional, use with great care, the

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