[rkward-cvs] SF.net SVN: rkward:[3904] trunk/rkward/packages/rkwarddev/R/rk.plugin. skeleton.R

[m-eik at users.sourceforge.net]

Revision: 3904
          http://rkward.svn.sourceforge.net/rkward/?rev=3904&view=rev
Author:   m-eik
Date:     2011-10-07 20:20:07 +0000 (Fri, 07 Oct 2011)
Log Message:
-----------
rkwarddev: ha, how funny is that: the symptom here (no "setting" scan for a help file) lead to a real bug fix in XiMpLe (couldn't parse the generated XML file correctly), and then it turns out that had nothing to do with the actual bug here, because the whole scan was omitted in the first place due to an error in r.plugin.skeleton()...

Modified Paths:
--------------
    trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R

Modified: trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R
===================================================================
--- trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R	2011-10-07 20:06:23 UTC (rev 3903)
+++ trunk/rkward/packages/rkwarddev/R/rk.plugin.skeleton.R	2011-10-07 20:20:07 UTC (rev 3904)
@@ -254,12 +254,16 @@
 	if("rkh" %in% create){
 		if(isTRUE(checkCreateFiles(plugin.rkh))){
 			# summary=NULL, usage=NULL, sections=NULL, settings="scan", related=NULL, technical=NULL
-			got.rkh.options <- names(js)
+			got.rkh.options <- names(rkh)
 			# if settings were defined manually, this overwrites the scan
-			if("settings" %in% scan & !"settings" %in% got.rkh.options){
-				rkh[["settings"]] <- rk.rkh.settings(rk.rkh.scan(XML.plugin))
+			if(!"settings" %in% got.rkh.options){
+				if("settings" %in% scan){
+					rkh[["settings"]] <- rk.rkh.settings(rk.rkh.scan(XML.plugin))
+				} else {
+					rkh[["settings"]] <- eval(formals(rk.rkh.doc)[["settings"]])
+				}
 			} else {}
-			for (this.opt in c("summary", "usage", "sections", "settings", "related", "technical")){
+			for (this.opt in c("summary", "usage", "sections", "related", "technical")){
 				if(!this.opt %in% got.rkh.options) {
 					rkh[[this.opt]] <- eval(formals(rk.rkh.doc)[[this.opt]])
 				} else {}

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