# HG changeset patch # User Waqas Hussain # Date 1354495337 -18000 # Node ID f2becd36d1d0341128b8ec39235239275329b4bd # Parent 63db6f2817082ddda1c8ba5656ee78fbb64107dd tools/openfire2prosody: Use util.xml. diff -r 63db6f281708 -r f2becd36d1d0 tools/openfire2prosody.lua --- a/tools/openfire2prosody.lua Mon Dec 03 05:41:18 2012 +0500 +++ b/tools/openfire2prosody.lua Mon Dec 03 05:42:17 2012 +0500 @@ -18,57 +18,7 @@ prosody.platform = "posix"; end -local lxp = require "lxp"; -local st = require "util.stanza"; - -local parse_xml = (function() - local ns_prefixes = { - ["http://www.w3.org/XML/1998/namespace"] = "xml"; - }; - local ns_separator = "\1"; - local ns_pattern = "^([^"..ns_separator.."]*)"..ns_separator.."?(.*)$"; - return function(xml) - local handler = {}; - local stanza = st.stanza("root"); - function handler:StartElement(tagname, attr) - local curr_ns,name = tagname:match(ns_pattern); - if name == "" then - curr_ns, name = "", curr_ns; - end - if curr_ns ~= "" then - attr.xmlns = curr_ns; - end - for i=1,#attr do - local k = attr[i]; - attr[i] = nil; - local ns, nm = k:match(ns_pattern); - if nm ~= "" then - ns = ns_prefixes[ns]; - if ns then - attr[ns..":"..nm] = attr[k]; - attr[k] = nil; - end - end - end - stanza:tag(name, attr); - end - function handler:CharacterData(data) - stanza:text(data); - end - function handler:EndElement(tagname) - stanza:up(); - end - local parser = lxp.new(handler, "\1"); - local ok, err, line, col = parser:parse(xml); - if ok then ok, err, line, col = parser:parse(); end - --parser:close(); - if ok then - return stanza.tags[1]; - else - return ok, err.." (line "..line..", col "..col..")"; - end - end; -end)(); +local parse_xml = require "util.xml".parse; -----------------------------------------------------------------------