projects
/
prosody.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
net.httpserver: Revert commit eccd3c87d717 which has since been fixed in a better way
[prosody.git]
/
tools
/
xep227toprosody.lua
diff --git
a/tools/xep227toprosody.lua
b/tools/xep227toprosody.lua
index bfe06c4811929ba4ff5fa3b3b9cb0fedec193621..23e5948b7317339730dece8cc07a46bfad5c28d1 100755
(executable)
--- a/
tools/xep227toprosody.lua
+++ b/
tools/xep227toprosody.lua
@@
-36,13
+36,15
@@
end
local lxp = require "lxp";
local st = require "util.stanza";
local lxp = require "lxp";
local st = require "util.stanza";
-local init_xmlhandlers = require "core.xmlhandlers";
+local xmppstream = require "util.xmppstream";
+local new_xmpp_handlers = xmppstream.new_sax_handlers;
local dm = require "util.datamanager"
dm.set_data_path("data");
local dm = require "util.datamanager"
dm.set_data_path("data");
-local ns_separator = "\1";
-local ns_pattern = "^([^"..ns_separator.."]*)"..ns_separator.."?(.*)$";
-local ns_xep227 = "http://www.xmpp.org/extensions/xep-0227.html#ns";
+local ns_separator = xmppstream.ns_separator;
+local ns_pattern = xmppstream.ns_pattern;
+
+local xmlns_xep227 = "http://www.xmpp.org/extensions/xep-0227.html#ns";
-----------------------------------------------------------------------
-----------------------------------------------------------------------
@@
-146,7
+148,7
@@
local user_name = "";
local cb = {
stream_tag = "user",
local cb = {
stream_tag = "user",
- stream_ns = ns_xep227,
+ stream_ns =
xml
ns_xep227,
};
function cb.streamopened(session, attr)
session.notopen = false;
};
function cb.streamopened(session, attr)
session.notopen = false;
@@
-176,7
+178,7
@@
function cb.handlestanza(session, stanza)
end
end
end
end
-local user_handlers =
init_xmlhandlers({ notopen = true,
}, cb);
+local user_handlers =
new_xmpp_handlers({ notopen = true
}, cb);
-----------------------------------------------------------------------
-----------------------------------------------------------------------
@@
-195,10
+197,10
@@
function lxp_handlers.StartElement(parser, elementname, attributes)
if curr_host ~= "" then
-- forward to xmlhandlers
user_handlers:StartElement(elementname, attributes);
if curr_host ~= "" then
-- forward to xmlhandlers
user_handlers:StartElement(elementname, attributes);
- elseif (curr_ns == ns_xep227) and (name == "host") then
+ elseif (curr_ns ==
xml
ns_xep227) and (name == "host") then
curr_host = attributes["jid"]; -- start of host element
print("Begin parsing host "..curr_host);
curr_host = attributes["jid"]; -- start of host element
print("Begin parsing host "..curr_host);
- elseif (curr_ns ~= ns_xep227) or (name ~= "server-data") then
+ elseif (curr_ns ~=
xml
ns_xep227) or (name ~= "server-data") then
io.stderr:write("Unhandled XML element: ", name, "\n");
os.exit(1);
end
io.stderr:write("Unhandled XML element: ", name, "\n");
os.exit(1);
end
@@
-213,14
+215,14
@@
function lxp_handlers.EndElement(parser, elementname)
--count = count - 1;
--io.write("- ", string.rep(" ", count), name, " (", curr_ns, ")", "\n")
if curr_host ~= "" then
--count = count - 1;
--io.write("- ", string.rep(" ", count), name, " (", curr_ns, ")", "\n")
if curr_host ~= "" then
- if (curr_ns == ns_xep227) and (name == "host") then
+ if (curr_ns ==
xml
ns_xep227) and (name == "host") then
print("End parsing host "..curr_host);
curr_host = "" -- end of host element
else
-- forward to xmlhandlers
user_handlers:EndElement(elementname);
end
print("End parsing host "..curr_host);
curr_host = "" -- end of host element
else
-- forward to xmlhandlers
user_handlers:EndElement(elementname);
end
- elseif (curr_ns ~= ns_xep227) or (name ~= "server-data") then
+ elseif (curr_ns ~=
xml
ns_xep227) or (name ~= "server-data") then
io.stderr:write("Unhandled XML element: ", name, "\n");
os.exit(1);
end
io.stderr:write("Unhandled XML element: ", name, "\n");
os.exit(1);
end