[rkward-cvs] SF.net SVN: rkward:[4410] trunk/rkward/packages/XiMpLe

[m-eik at users.sourceforge.net]

Revision: 4410
          http://rkward.svn.sourceforge.net/rkward/?rev=4410&view=rev
Author:   m-eik
Date:     2012-11-05 16:06:48 +0000 (Mon, 05 Nov 2012)
Log Message:
-----------
XiMpLe: fixed two bugs

Modified Paths:
--------------
    trunk/rkward/packages/XiMpLe/ChangeLog
    trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R

Modified: trunk/rkward/packages/XiMpLe/ChangeLog
===================================================================
--- trunk/rkward/packages/XiMpLe/ChangeLog	2012-11-04 19:25:16 UTC (rev 4409)
+++ trunk/rkward/packages/XiMpLe/ChangeLog	2012-11-05 16:06:48 UTC (rev 4410)
@@ -3,6 +3,12 @@
 changes in version 0.03-16 (2012-10-30)
 added:
   - added examples to all functions
+  - added a vignette
+fixed:
+  - fixed dropping of last tag/text value if XML was incomplete, e.g., just
+    an excerpt of a full tree
+  - fixed handling of empty tags without space, e.g. "<br/>" instead of "<br
+    />"
 
 changes in version 0.03-15 (2012-10-26)
 fixed:

Modified: trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R
===================================================================
--- trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R	2012-11-04 19:25:16 UTC (rev 4409)
+++ trunk/rkward/packages/XiMpLe/R/XiMpLe-internal.R	2012-11-05 16:06:48 UTC (rev 4410)
@@ -401,7 +401,7 @@
 ## function XML.tagName()
 XML.tagName <- function(tag){
 	tag.names <- sapply(tag, function(this.tag){
-			tagName <- gsub("<([[:space:]!?/]*)([^[:space:]>]+).*", "\\2", this.tag, perl=TRUE)
+			tagName <- gsub("<([[:space:]!?/]*)([^[:space:]>/]+).*", "\\2", this.tag, perl=TRUE)
 			return(tagName)
 		})
 	names(tag.names) <- NULL
@@ -439,7 +439,7 @@
 	tag.no <- start
 	## uncomment to debug:
 	# cat(start,"\n")
-	while (tag.no < num.all.tags){
+	while (tag.no <= num.all.tags){
 		## uncomment to debug:
 		# time.spent <- system.time({
 		this.tag <- get("single.tags", envir=single.tags.env)[tag.no]

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