[rkward-cvs] SF.net SVN: rkward:[2782] trunk/rkward/rkward/rbackend/rpackages/rkward/R/ public.R

Wed Mar 10 19:24:43 UTC 2010

Revision: 2782
          http://rkward.svn.sourceforge.net/rkward/?rev=2782&view=rev
Author:   tfry
Date:     2010-03-10 19:24:43 +0000 (Wed, 10 Mar 2010)

Log Message:
-----------
Make sure not to show the output window only for being initialized (e.g. on first run of RKWard).

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

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/public.R
===================================================================

--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/public.R	2010-03-10 11:56:17 UTC (rev 2781)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/public.R	2010-03-10 19:24:43 UTC (rev 2782)
@@ -114,17 +114,19 @@
 	return (.rk.output.html.file)
 }
 
-"rk.set.output.html.file" <- function (x, no.init=FALSE) {
+"rk.set.output.html.file" <- function (x) {
 	stopifnot (is.character (x))
-	.rk.do.call ("set.output.file", x);
 	assign (".rk.output.html.file", x, as.environment ("package:rkward"))
 
-	if (!(no.init | file.exists (x))) {
+	if (!file.exists (x)) {
 		.rk.cat.output (paste ("<?xml version=\"1.0\" encoding=\"", .Call ("rk.locale.name"), "\"?>\n", sep=""));
 		.rk.cat.output ("<html><head><title>RKWard Output</title></head>\n<body>\n")
 		# This initial output mostly to indicate the output is really there, just empty for now
-		.rk.cat.output (paste ("<pre>RKWard output initialized", date (), "</pre>\n"));
+		.rk.cat.output (paste ("<pre>RKWard output initialized on", date (), "</pre>\n"));
 	}
+
+	# needs to come after initialization, so initialization alone does not trigger an update during startup
+	.rk.do.call ("set.output.file", x);
 }
 
 # renames a named object in a data.frame/list without changing it's position


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


