[rkward-cvs] SF.net SVN: rkward-code:[4551] trunk/rkward/packages/XiMpLe
m-eik at users.sf.net
m-eik at users.sf.net
Fri Feb 22 10:18:59 UTC 2013
Revision: 4551
http://sourceforge.net/p/rkward/code/4551
Author: m-eik
Date: 2013-02-22 10:18:58 +0000 (Fri, 22 Feb 2013)
Log Message:
-----------
XiMpLe: fix for full object replacement in XMLScan()<-
Modified Paths:
--------------
trunk/rkward/packages/XiMpLe/ChangeLog
trunk/rkward/packages/XiMpLe/DESCRIPTION
trunk/rkward/packages/XiMpLe/NAMESPACE
trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R
trunk/rkward/packages/XiMpLe/R/zzz_is_get_utils.R
trunk/rkward/packages/XiMpLe/inst/NEWS.Rd
trunk/rkward/packages/XiMpLe/inst/doc/XiMpLe_vignette.pdf
trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd
Modified: trunk/rkward/packages/XiMpLe/ChangeLog
===================================================================
--- trunk/rkward/packages/XiMpLe/ChangeLog 2013-02-21 12:20:10 UTC (rev 4550)
+++ trunk/rkward/packages/XiMpLe/ChangeLog 2013-02-22 10:18:58 UTC (rev 4551)
@@ -1,6 +1,6 @@
ChangeLog for package XiMpLe
-changes in version 0.03-19 (2013-02-20)
+changes in version 0.03-19 (2013-02-22)
added:
- new methods XMLScan() and XMLScan()<- to search an XML tree recursively
for appearances of certain node names
Modified: trunk/rkward/packages/XiMpLe/DESCRIPTION
===================================================================
--- trunk/rkward/packages/XiMpLe/DESCRIPTION 2013-02-21 12:20:10 UTC (rev 4550)
+++ trunk/rkward/packages/XiMpLe/DESCRIPTION 2013-02-22 10:18:58 UTC (rev 4551)
@@ -20,7 +20,7 @@
Authors at R: c(person(given="Meik", family="Michalke",
email="meik.michalke at hhu.de", role=c("aut", "cre")))
Version: 0.03-19
-Date: 2013-02-20
+Date: 2013-02-22
Collate:
'XiMpLe-internal.R'
'XiMpLe.node-class.R'
Modified: trunk/rkward/packages/XiMpLe/NAMESPACE
===================================================================
--- trunk/rkward/packages/XiMpLe/NAMESPACE 2013-02-21 12:20:10 UTC (rev 4550)
+++ trunk/rkward/packages/XiMpLe/NAMESPACE 2013-02-22 10:18:58 UTC (rev 4551)
@@ -1,31 +1,31 @@
+export(XMLNode)
+export(XMLTree)
+export(is.XiMpLe.doc)
+export(is.XiMpLe.node)
+export(parseXMLTree)
+export(pasteXMLNode)
+export(pasteXMLTag)
+export(pasteXMLTree)
exportClasses(XiMpLe.doc)
exportClasses(XiMpLe.node)
-export(is.XiMpLe.doc)
-export(is.XiMpLe.node)
-exportMethods(node)
+exportMethods("XMLAttrs<-")
+exportMethods("XMLChildren<-")
+exportMethods("XMLDTD<-")
+exportMethods("XMLDecl<-")
+exportMethods("XMLFile<-")
+exportMethods("XMLName<-")
+exportMethods("XMLScan<-")
+exportMethods("XMLValue<-")
exportMethods("node<-")
-exportMethods(pasteXML)
-exportMethods(show)
exportMethods(XMLAttrs)
-exportMethods("XMLAttrs<-")
exportMethods(XMLChildren)
-exportMethods("XMLChildren<-")
+exportMethods(XMLDTD)
exportMethods(XMLDecl)
-exportMethods("XMLDecl<-")
-exportMethods(XMLDTD)
-exportMethods("XMLDTD<-")
exportMethods(XMLFile)
-exportMethods("XMLFile<-")
exportMethods(XMLName)
-exportMethods("XMLName<-")
exportMethods(XMLScan)
-exportMethods("XMLScan<-")
exportMethods(XMLValue)
-exportMethods("XMLValue<-")
-export(parseXMLTree)
-export(pasteXMLNode)
-export(pasteXMLTag)
-export(pasteXMLTree)
-export(XMLNode)
-export(XMLTree)
+exportMethods(node)
+exportMethods(pasteXML)
+exportMethods(show)
import(methods)
Modified: trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R
===================================================================
--- trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R 2013-02-21 12:20:10 UTC (rev 4550)
+++ trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R 2013-02-22 10:18:58 UTC (rev 4551)
@@ -4,7 +4,7 @@
#' Package: \tab XiMpLe\cr
#' Type: \tab Package\cr
#' Version: \tab 0.03-19\cr
-#' Date: \tab 2013-02-20\cr
+#' Date: \tab 2013-02-22\cr
#' Depends: \tab R (>= 2.9.0),methods\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
Modified: trunk/rkward/packages/XiMpLe/R/zzz_is_get_utils.R
===================================================================
--- trunk/rkward/packages/XiMpLe/R/zzz_is_get_utils.R 2013-02-21 12:20:10 UTC (rev 4550)
+++ trunk/rkward/packages/XiMpLe/R/zzz_is_get_utils.R 2013-02-22 10:18:58 UTC (rev 4551)
@@ -413,9 +413,14 @@
obj <- replace.nodes(
nodes=child.list(obj),
nName=name,
- replacement=value)[[1]]
+ replacement=value)
stopifnot(validObject(object=obj, test=TRUE, complete=TRUE))
- return(obj)
+ if(identical(obj, as.list(value))){
+ # it seems the full object was replaced by value
+ return(value)
+ } else {
+ return(obj[[1]])
+ }
}
)
Modified: trunk/rkward/packages/XiMpLe/inst/NEWS.Rd
===================================================================
--- trunk/rkward/packages/XiMpLe/inst/NEWS.Rd 2013-02-21 12:20:10 UTC (rev 4550)
+++ trunk/rkward/packages/XiMpLe/inst/NEWS.Rd 2013-02-22 10:18:58 UTC (rev 4551)
@@ -1,7 +1,7 @@
\name{NEWS}
\title{News for Package 'XiMpLe'}
\encoding{UTF-8}
-\section{Changes in XiMpLe version 0.03-19 (2013-02-19)}{
+\section{Changes in XiMpLe version 0.03-19 (2013-02-22)}{
\subsection{added}{
\itemize{
\item new methods \code{XMLScan()} and \code{XMLScan()}<- to search an XML tree recursively
Modified: trunk/rkward/packages/XiMpLe/inst/doc/XiMpLe_vignette.pdf
===================================================================
(Binary files differ)
Modified: trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd
===================================================================
--- trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd 2013-02-21 12:20:10 UTC (rev 4550)
+++ trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd 2013-02-22 10:18:58 UTC (rev 4551)
@@ -9,7 +9,7 @@
\details{
\tabular{ll}{ Package: \tab XiMpLe\cr Type: \tab
Package\cr Version: \tab 0.03-19\cr Date: \tab
- 2013-02-20\cr Depends: \tab R (>= 2.9.0),methods\cr
+ 2013-02-22\cr Depends: \tab R (>= 2.9.0),methods\cr
Enhances: \tab rkward\cr Encoding: \tab UTF-8\cr License:
\tab GPL (>= 3)\cr LazyLoad: \tab yes\cr URL: \tab
http://reaktanz.de/?c=hacking&s=XiMpLe\cr }
More information about the rkward-tracker
mailing list