Merge pull request #4 from olofsen/master

add_cdata function

Author: lindahua

README.md

@@ -263,6 +263,9 @@ e = new_child(parent, name)  # create a new element and add it as a child
 add_text(e, text)    # add text content to an element
                      # equiv. to new_textnode + add_child
 
+add_cdata(xdoc, e, text)    # add cdata content to an element
+                            # equiv. to new_cdatanode + add_child
+
 set_attribute(e, name, value)  # set an attribute of an element
                                # this returns the added attribute 
                                # as an instance of XMLAttr

run_tests.jl

@@ -1,4 +1,4 @@
-tests = ["parse", "create"]
+tests = ["parse", "create", "cdata"]
 
 for t in tests
 	fpath = joinpath("test", "$t.jl")

src/LightXML.jl

@@ -13,7 +13,7 @@ module LightXML
 	child_nodes, has_children, attributes, has_attributes, attributes_dict,
 	child_elements, find_element, get_elements_by_tagname,
 
-	new_element, add_child, new_child, new_textnode, add_text,
+	new_element, add_child, new_child, new_textnode, add_text, add_cdata,
 	set_attribute, set_attributes,
 
 	# document
@@ -27,4 +27,5 @@ module LightXML
 	include("utils.jl")
 	include("nodes.jl")
 	include("document.jl")
+	include("cdata.jl")
 end

src/cdata.jl

@@ -0,0 +1,6 @@
+function new_cdatanode(xdoc::XMLDocument, txt::ASCIIString)
+        p = ccall(xmlNewCDataBlock, Xptr, (Xptr, Xstr, Cint), xdoc.ptr, txt, length(txt)+1)
+        XMLNode(p)
+end
+
+add_cdata(xdoc::XMLDocument, x::XMLElement, txt::ASCIIString) = add_child(x, new_cdatanode(xdoc,txt))

src/clib.jl

@@ -49,6 +49,7 @@ _xcopystr(p::Xstr) = (r = bytestring(p); _xmlfree(p); r)
 @lx2func xmlNewNode
 @lx2func xmlAddChild
 @lx2func xmlNewText
+@lx2func xmlNewCDataBlock
 @lx2func xmlSetProp
 
 # functions for documents

test/cdata.jl

@@ -0,0 +1,19 @@
+using LightXML
+
+xdoc = XMLDocument()
+
+xroot = create_root(xdoc, "States")
+
+xs1 = new_child(xroot, "State")
+add_cdata(xdoc, xs1, "Massachussetts")
+
+rtxt = """
+<?xml version="1.0" encoding="utf-8"?>
+<States>
+  <State><![CDATA[Massachussetts]]></State>
+</States>
+"""
+
+@assert strip(string(xdoc)) == strip(rtxt)
+
+free(xdoc)