mirrors/prosody
1
0
Fork 0
mirror of https://github.com/bjc/prosody.git synced 2025-04-04 13:47:41 +03:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge 0.9->0.10

Browse source
This commit is contained in:
Kim Alvefur 2015-09-25 18:11:24 +02:00
commit 3d29bb52de
1 changed files with 3 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

6
tools/xep227toprosody.lua
View file

@ -202,7 +202,7 @@ function lxp_handlers.StartElement(parser, elementname, attributes)
--count = count + 1; --count = count + 1;
if curr_host ~= "" then if curr_host ~= "" then
-- forward to xmlhandlers -- forward to xmlhandlers
user_handlers:StartElement(elementname, attributes); user_handlers.StartElement(parser, elementname, attributes);
elseif (curr_ns == xmlns_xep227) and (name == "host") then elseif (curr_ns == xmlns_xep227) and (name == "host") then
curr_host = attributes["jid"]; -- start of host element curr_host = attributes["jid"]; -- start of host element
print("Begin parsing host "..curr_host); print("Begin parsing host "..curr_host);
@ -226,7 +226,7 @@ function lxp_handlers.EndElement(parser, elementname)
curr_host = "" -- end of host element curr_host = "" -- end of host element
else else
-- forward to xmlhandlers -- forward to xmlhandlers
user_handlers:EndElement(elementname); user_handlers.EndElement(parser, elementname);
end end
elseif (curr_ns ~= xmlns_xep227) or (name ~= "server-data") then elseif (curr_ns ~= xmlns_xep227) or (name ~= "server-data") then
io.stderr:write("Unhandled XML element: ", name, "\n"); io.stderr:write("Unhandled XML element: ", name, "\n");
@ -237,7 +237,7 @@ end
function lxp_handlers.CharacterData(parser, string) function lxp_handlers.CharacterData(parser, string)
if curr_host ~= "" then if curr_host ~= "" then
-- forward to xmlhandlers -- forward to xmlhandlers
user_handlers:CharacterData(string); user_handlers.CharacterData(parser, string);
end end
end end