[rkward-cvs] SF.net SVN: rkward:[3968] trunk/rkward/packages/rkwarddev

[m-eik at users.sourceforge.net]

Revision: 3968
          http://rkward.svn.sourceforge.net/rkward/?rev=3968&view=rev
Author:   m-eik
Date:     2011-10-18 13:09:57 +0000 (Tue, 18 Oct 2011)
Log Message:
-----------
rkwarddev: fixed rk.JS.array() (generated one "=" too many)

Modified Paths:
--------------
    trunk/rkward/packages/rkwarddev/ChangeLog
    trunk/rkward/packages/rkwarddev/R/rk-internal.R

Modified: trunk/rkward/packages/rkwarddev/ChangeLog
===================================================================
--- trunk/rkward/packages/rkwarddev/ChangeLog	2011-10-18 12:51:12 UTC (rev 3967)
+++ trunk/rkward/packages/rkwarddev/ChangeLog	2011-10-18 13:09:57 UTC (rev 3968)
@@ -3,6 +3,7 @@
 ## 0.03-7 (2011-10-17)
   - added "checkable" and "checked" options to rk.XML.frame()
   - set rk.paste.JS() default level to 2
+  - fixed bug in rk.JS.array() (superfluous "=" in generated code)
 
 ## 0.03-6 (2011-10-13)
   - lifted rkward package dependecies to 0.5.7 (needed for rk.load.pluginmaps())

Modified: trunk/rkward/packages/rkwarddev/R/rk-internal.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk-internal.R	2011-10-18 12:51:12 UTC (rev 3967)
+++ trunk/rkward/packages/rkwarddev/R/rk-internal.R	2011-10-18 13:09:57 UTC (rev 3968)
@@ -440,7 +440,7 @@
 		funct.start <- ""
 		funct.end <- ""
 	} else {
-		funct.start <- paste("=", funct, "(", sep="")
+		funct.start <- paste(funct, "(", sep="")
 		funct.end <- ")"
 	}
 
@@ -466,32 +466,6 @@
 	return(JS.array)
 } ## end function paste.JS.array()
 
-# 	var options = ", alternative=\"" + hypothesis + "\"";
-# 	if (paired) options += ", paired=TRUE";
-# 	if ((!paired) && varequal) options += ", var.equal=TRUE";
-# 	if (conflevel != "0.95") options += ", conf.level=" + conflevel;
-# 
-# 	echo ('result <- t.test (' + x + ", " + y + options + ')\n');
-
-# array solution:
-# 	var arrAuthor = new Array();
-# 	if(inpGivennam) {
-# 		arrAuthor.push("given=\"" + inpGivennam + "\"");
-# 	} else {}
-# 	if(inpFamilynm) {
-# 		arrAuthor.push("family=\"" + inpFamilynm + "\"");
-# 	} else {}
-# 	if(inpEmail) {
-# 		arrAuthor.push("email=\"" + inpEmail + "\"");
-# 	} else {}
-# 	arrAuthor = arrAuthor.filter(String);
-# 
-# 	if(arrAuthor.length > 0) {
-# 		var author = ", author=person(" + arrAuthor.join(", ") + ")";
-# 	} else {
-# 		var author = "";
-# 	}
-
 ## function paste.JS.options()
 paste.JS.options <- function(object, level=2, indent.by="\t", array=NULL, funct=NULL){
 	stopifnot(inherits(object, "rk.JS.opt"))

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