[rkward-cvs] SF.net SVN: rkward-code:[4565] trunk/rkward/packages/XiMpLe
m-eik at users.sf.net
m-eik at users.sf.net
Tue Feb 26 21:07:02 UTC 2013
Revision: 4565
http://sourceforge.net/p/rkward/code/4565
Author: m-eik
Date: 2013-02-26 21:07:01 +0000 (Tue, 26 Feb 2013)
Log Message:
-----------
XiMpLe: tried to help with empty attributes, but failed... for now.
Modified Paths:
--------------
trunk/rkward/packages/XiMpLe/ChangeLog
trunk/rkward/packages/XiMpLe/DESCRIPTION
trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R
trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R
trunk/rkward/packages/XiMpLe/debian/changelog
trunk/rkward/packages/XiMpLe/debian/control
trunk/rkward/packages/XiMpLe/debian/copyright
trunk/rkward/packages/XiMpLe/debian/rules
trunk/rkward/packages/XiMpLe/inst/CITATION
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-25 21:36:50 UTC (rev 4564)
+++ trunk/rkward/packages/XiMpLe/ChangeLog 2013-02-26 21:07:01 UTC (rev 4565)
@@ -1,5 +1,13 @@
ChangeLog for package XiMpLe
+changes in version 0.03-20 (2013-02-26)
+changed:
+ - CURRENTLY TURNED OFF: while parsing attributes, XiMpLe will try to force empty attributes into
+ attribute="attribute". firstly, empty attributes are not valid XML.
+ secondly, they break parsing, because they can't be represented in a list. only
+ works if the attribute in question is the last in line. needs improvement
+ and should be made optional.
+
changes in version 0.03-19 (2013-02-24)
added:
- new methods XMLScan() and XMLScan()<- to search an XML tree recursively
Modified: trunk/rkward/packages/XiMpLe/DESCRIPTION
===================================================================
--- trunk/rkward/packages/XiMpLe/DESCRIPTION 2013-02-25 21:36:50 UTC (rev 4564)
+++ trunk/rkward/packages/XiMpLe/DESCRIPTION 2013-02-26 21:07:01 UTC (rev 4565)
@@ -19,8 +19,8 @@
URL: http://reaktanz.de/?c=hacking&s=XiMpLe
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-24
+Version: 0.03-20
+Date: 2013-02-26
Collate:
'XiMpLe-internal.R'
'XiMpLe.node-class.R'
Modified: trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R
===================================================================
--- trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R 2013-02-25 21:36:50 UTC (rev 4564)
+++ trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R 2013-02-26 21:07:01 UTC (rev 4565)
@@ -228,6 +228,10 @@
separated.tag <- gsub("=[[:space:]]*\"([^\"]*)\"[[:space:]]+([^[:space:]=]+)", "=\"\\1\", \\2", stripped.tag, perl=TRUE)
# to be on the safe side, escape all list names, in case there's unexpected special characters in them
separated.tag <- gsub("( ,)?([^[:space:],\"]*)=\"", "\\1\"\\2\"=\"", separated.tag, perl=TRUE)
+ # empty attributes are not valid, force them into atrribute="attribute"
+ # does only work partially it the empty attribute is the last in line
+ # and still causes *problems* in matching string in the value of other attributes!
+ # separated.tag <- gsub("(, |\\A)([^[:space:],\"=][[:alnum:]]*)", "\\1\"\\2\"=\"\\2\"", separated.tag, perl=TRUE)
parsed.list <- eval(parse(text=paste("list(", separated.tag, ")")))
}
if(XML.declaration(tag)){
Modified: trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R
===================================================================
--- trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R 2013-02-25 21:36:50 UTC (rev 4564)
+++ trunk/rkward/packages/XiMpLe/R/XiMpLe-package.R 2013-02-26 21:07:01 UTC (rev 4565)
@@ -3,8 +3,8 @@
#' \tabular{ll}{
#' Package: \tab XiMpLe\cr
#' Type: \tab Package\cr
-#' Version: \tab 0.03-19\cr
-#' Date: \tab 2013-02-24\cr
+#' Version: \tab 0.03-20\cr
+#' Date: \tab 2013-02-26\cr
#' Depends: \tab R (>= 2.9.0),methods\cr
#' Enhances: \tab rkward\cr
#' Encoding: \tab UTF-8\cr
Modified: trunk/rkward/packages/XiMpLe/debian/changelog
===================================================================
--- trunk/rkward/packages/XiMpLe/debian/changelog 2013-02-25 21:36:50 UTC (rev 4564)
+++ trunk/rkward/packages/XiMpLe/debian/changelog 2013-02-26 21:07:01 UTC (rev 4565)
@@ -1,3 +1,9 @@
+r-other-reaktanz-ximple (0.03-20-1) unstable; urgency=low
+
+ * new upstream release
+
+ -- m.eik michalke <meik.michalke at hhu.de> Tue, 26 Feb 2013 20:48:59 +0000
+
r-other-reaktanz-ximple (0.03-19-1) unstable; urgency=low
* new upstream release
Modified: trunk/rkward/packages/XiMpLe/debian/control
===================================================================
--- trunk/rkward/packages/XiMpLe/debian/control 2013-02-25 21:36:50 UTC (rev 4564)
+++ trunk/rkward/packages/XiMpLe/debian/control 2013-02-26 21:07:01 UTC (rev 4565)
@@ -1,4 +1,4 @@
-Source: r-other-rkward-ximple
+Source: r-other-reaktanz-ximple
Section: math
Priority: optional
Maintainer: m.eik michalke <meik.michalke at hhu.de>
@@ -6,7 +6,7 @@
Standards-Version: 3.9.3.1
Homepage: http://reaktanz.de/?c=hacking&s=XiMpLe
-Package: r-other-rkward-ximple
+Package: r-other-reaktanz-ximple
Architecture: all
Section: math
Depends: r-base (>= 2.15.0)
Modified: trunk/rkward/packages/XiMpLe/debian/copyright
===================================================================
--- trunk/rkward/packages/XiMpLe/debian/copyright 2013-02-25 21:36:50 UTC (rev 4564)
+++ trunk/rkward/packages/XiMpLe/debian/copyright 2013-02-26 21:07:01 UTC (rev 4565)
@@ -3,7 +3,7 @@
This Debian package was put together m.eik michalke <meik.michalke at hhu.de>.
The package was renamed from its upstream name 'XiMpLe' to
-'r-other-rkward-ximple' in harmony with the R packaging policy to indicate
+'r-other-reaktanz-ximple' in harmony with the R packaging policy to indicate
that the package is external to the CRAN or BioC repositories.
XiMpLe Copyright (C) 2013 Meik Michalke, released under the
Modified: trunk/rkward/packages/XiMpLe/debian/rules
===================================================================
--- trunk/rkward/packages/XiMpLe/debian/rules 2013-02-25 21:36:50 UTC (rev 4564)
+++ trunk/rkward/packages/XiMpLe/debian/rules 2013-02-26 21:07:01 UTC (rev 4565)
@@ -1,9 +1,9 @@
#!/usr/bin/make -f
# -*- makefile -*-
-# debian/rules file for the Debian/GNU Linux r-other-rkward-ximple package
+# debian/rules file for the Debian/GNU Linux r-other-reaktanz-ximple package
# Copyright 2013 by m.eik michalke <meik.michalke at hhu.de>
-debRreposname := other-rkward
+debRreposname := other-reaktanz
include /usr/share/R/debian/r-cran.mk
Modified: trunk/rkward/packages/XiMpLe/inst/CITATION
===================================================================
--- trunk/rkward/packages/XiMpLe/inst/CITATION 2013-02-25 21:36:50 UTC (rev 4564)
+++ trunk/rkward/packages/XiMpLe/inst/CITATION 2013-02-26 21:07:01 UTC (rev 4565)
@@ -2,12 +2,12 @@
title="XiMpLe: A simple XML tree parser and generator",
author="Meik Michalke",
year="2013",
- note="(Version 0.03-19)",
+ note="(Version 0.03-20)",
url="http://reaktanz.de/?c=hacking&s=XiMpLe",
textVersion =
paste("Michalke, M. (2013). ",
- "XiMpLe: A simple XML tree parser and generator (Version 0.03-19). ",
+ "XiMpLe: A simple XML tree parser and generator (Version 0.03-20). ",
"Available from http://reaktanz.de/?c=hacking&s=XiMpLe",
sep=""),
Modified: trunk/rkward/packages/XiMpLe/inst/NEWS.Rd
===================================================================
--- trunk/rkward/packages/XiMpLe/inst/NEWS.Rd 2013-02-25 21:36:50 UTC (rev 4564)
+++ trunk/rkward/packages/XiMpLe/inst/NEWS.Rd 2013-02-26 21:07:01 UTC (rev 4565)
@@ -1,6 +1,17 @@
\name{NEWS}
\title{News for Package 'XiMpLe'}
\encoding{UTF-8}
+\section{Changes in XiMpLe version 0.03-20 (2013-02-26)}{
+ \subsection{changed}{
+ \itemize{
+ \item CURRENTLY TURNED OFF: while parsing attributes, XiMpLe will try to force empty attributes into
+ attribute=\code{"attribute"}. firstly, empty attributes are not valid XML.
+ secondly, they break parsing, because they can't be represented in a list. only
+ works if the attribute in question is the last in line. needs improvement
+ and should be made optional.
+ }
+ }
+}
\section{Changes in XiMpLe version 0.03-19 (2013-02-24)}{
\subsection{added}{
\itemize{
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-25 21:36:50 UTC (rev 4564)
+++ trunk/rkward/packages/XiMpLe/man/XiMpLe-package.Rd 2013-02-26 21:07:01 UTC (rev 4565)
@@ -8,8 +8,8 @@
}
\details{
\tabular{ll}{ Package: \tab XiMpLe\cr Type: \tab
- Package\cr Version: \tab 0.03-19\cr Date: \tab
- 2013-02-24\cr Depends: \tab R (>= 2.9.0),methods\cr
+ Package\cr Version: \tab 0.03-20\cr Date: \tab
+ 2013-02-26\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