aboutsummaryrefslogtreecommitdiffstats
path: root/tools/migration/migrator/jabberd14.lua
diff options
context:
space:
mode:
authorWaqas Hussain <waqas20@gmail.com>2012-12-03 06:07:00 +0500
committerWaqas Hussain <waqas20@gmail.com>2012-12-03 06:07:00 +0500
commit3f690f3c1dcf3d77e2d3ee818ec2b3bd52a47d55 (patch)
tree32193989f72cd93a36bea4a74cfbfb547277fe8b /tools/migration/migrator/jabberd14.lua
parentf2f277328207d92db9439ad2a31125dad55cf7ca (diff)
parentb007f899d502fa17cdce27dfcb2a288b44ba1e89 (diff)
downloadprosody-3f690f3c1dcf3d77e2d3ee818ec2b3bd52a47d55.tar.gz
prosody-3f690f3c1dcf3d77e2d3ee818ec2b3bd52a47d55.zip
Merge 0.9->trunk.
Diffstat (limited to 'tools/migration/migrator/jabberd14.lua')
-rw-r--r--tools/migration/migrator/jabberd14.lua51
1 files changed, 1 insertions, 50 deletions
diff --git a/tools/migration/migrator/jabberd14.lua b/tools/migration/migrator/jabberd14.lua
index 54c45d94..2f0b0b78 100644
--- a/tools/migration/migrator/jabberd14.lua
+++ b/tools/migration/migrator/jabberd14.lua
@@ -1,7 +1,7 @@
local lfs = require "lfs";
-local lxp = require "lxp";
local st = require "util.stanza";
+local parse_xml = require "util.xml".parse;
local os_getenv = os.getenv;
local io_open = io.open;
local assert = assert;
@@ -17,55 +17,6 @@ local function clean_path(path)
return path:gsub("\\", "/"):gsub("//+", "/"):gsub("^~", os_getenv("HOME") or "~");
end
-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 function load_xml(path)
local f, err = io_open(path);
if not f then return f, err; end