use formatted output

Author: lindahua

src/clib.jl

@@ -58,5 +58,7 @@ _xcopystr(p::Xstr) = (r = bytestring(p); _xmlfree(p); r)
 @lx2func xmlParseFile
 @lx2func xmlParseMemory
 @lx2func xmlDocDumpMemoryEnc
+@lx2func xmlDocDumpFormatMemoryEnc
 @lx2func xmlSaveFileEnc
+@lx2func xmlSaveFormatFileEnc
 

src/document.jl

@@ -100,8 +100,8 @@ end
 #### output
 
 function save_file(xdoc::XMLDocument, filename::ASCIIString; encoding::ASCIIString="utf-8")
-	ret = ccall(xmlSaveFileEnc, Cint, (Ptr{Cchar}, Xptr, Ptr{Cchar}), 
-		filename, xdoc.ptr, encoding)
+	ret = ccall(xmlSaveFormatFileEnc, Cint, (Ptr{Cchar}, Xptr, Ptr{Cchar}, Cint), 
+		filename, xdoc.ptr, encoding, 1)
 	if ret < 0
 		throw(XMLWriteError("Failed to save XML to file $filename"))
 	end
@@ -111,8 +111,8 @@ end
 function Base.string(xdoc::XMLDocument; encoding::ASCIIString="utf-8")	
 	buf_out = Array(Xstr, 1)
 	len_out = Array(Cint, 1)
-	ccall(xmlDocDumpMemoryEnc, Void, (Xptr, Ptr{Xstr}, Ptr{Cint}, Ptr{Cchar}), 
-		xdoc.ptr, buf_out, len_out, encoding)
+	ccall(xmlDocDumpFormatMemoryEnc, Void, (Xptr, Ptr{Xstr}, Ptr{Cint}, Ptr{Cchar}, Cint), 
+		xdoc.ptr, buf_out, len_out, encoding, 1)
 	_xcopystr(buf_out[1])
 end
 

src/nodes.jl

@@ -166,7 +166,7 @@ const DEFAULT_DUMPBUFFER_SIZE = 4096
 function Base.string(nd::XMLNode)
 	buf = XBuffer(DEFAULT_DUMPBUFFER_SIZE)
 	ccall(xmlNodeDump, Cint, (Xptr, Xptr, Xptr, Cint, Cint), 
-		buf.ptr, nd._struct.doc, nd.ptr, 0, 0)
+		buf.ptr, nd._struct.doc, nd.ptr, 0, 1)
 	r = content(buf)
 	free(buf)
 	return r

test/create.jl

@@ -13,3 +13,9 @@ add_text(xs2, "Illinois")
 set_attribute(xs2, "tag", "MA")
 
 show(xdoc)
+
+show(xroot)
+
+# save_file(xdoc, "tt.xml")
+
+free(xdoc)