[rkward-cvs] SF.net SVN: rkward:[4069] trunk/rkward

[tfry at users.sourceforge.net]

Revision: 4069
          http://rkward.svn.sourceforge.net/rkward/?rev=4069&view=rev
Author:   tfry
Date:     2011-12-03 14:35:39 +0000 (Sat, 03 Dec 2011)
Log Message:
-----------
Fix writing .rkworkpalce files to non-standard directory names. See http://sourceforge.net/projects/rkward/forums/forum/165574/topic/4857688 .

Modified Paths:
--------------
    trunk/rkward/ChangeLog
    trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R

Modified: trunk/rkward/ChangeLog
===================================================================
--- trunk/rkward/ChangeLog	2011-12-03 14:31:57 UTC (rev 4068)
+++ trunk/rkward/ChangeLog	2011-12-03 14:35:39 UTC (rev 4069)
@@ -1,3 +1,4 @@
+- Fixed: Saving / restoring workplace layout would fail when saving to directories with unusual characters
 - Only install translations which are at least 80% complete (not counting strings in plugins, which are not yet translatable)
 - When asking for workspace file to open, use appropriate file filter
 - When configured to ask for workspace to open on startup, don't prompt to save, first

Modified: trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R
===================================================================
--- trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R	2011-12-03 14:31:57 UTC (rev 4068)
+++ trunk/rkward/rkward/rbackend/rpackages/rkward/R/rk.workspace-functions.R	2011-12-03 14:35:39 UTC (rev 4069)
@@ -37,7 +37,7 @@
 #' 
 "rk.save.workplace" <- function (file=NULL, description=NULL) {
 	if (is.null (file)) {
-		file <- rk.get.workspace.url ()
+		file <- URLdecode (rk.get.workspace.url ())
 		if (is.null (file)) file <- rk.get.tempfile.name (prefix="unsaved", extension=".RData")
 		file <- paste (file, "rkworkplace", sep=".")
 	}
@@ -54,7 +54,7 @@
 			lines <- as.character (.GlobalEnv$.rk.workplace.save)
 			rm (list = c (".rk.workplace.save"), envir=globalenv ())
 		} else {
-			file <- rk.get.workspace.url ()
+			file <- URLdecode (rk.get.workspace.url ())
 			if (is.null (file)) file <- rk.get.tempfile.name (prefix="unsaved", extension=".RData")
 			file <- paste (file, "rkworkplace", sep=".")
 		}

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