Diff

tools/xep227toprosody.lua @ 6870:d5b416070f70

Merge 0.9->0.10
author Kim Alvefur <zash@zash.se>
date Fri, 25 Sep 2015 18:11:24 +0200
parent 5776:bd0ff8ae98a8
parent 6869:5ce783c37024
child 11680:a3d3fb9d0d43
line wrap: on
line diff
--- a/tools/xep227toprosody.lua	Fri Sep 25 18:07:33 2015 +0200
+++ b/tools/xep227toprosody.lua	Fri Sep 25 18:11:24 2015 +0200
@@ -202,7 +202,7 @@
 	--count = count + 1;
 	if curr_host ~= "" then
 		-- forward to xmlhandlers
-		user_handlers:StartElement(elementname, attributes);
+		user_handlers.StartElement(parser, elementname, attributes);
 	elseif (curr_ns == xmlns_xep227) and (name == "host") then
 		curr_host = attributes["jid"]; -- start of host element
 		print("Begin parsing host "..curr_host);
@@ -226,7 +226,7 @@
 			curr_host = "" -- end of host element
 		else
 			-- forward to xmlhandlers
-			user_handlers:EndElement(elementname);
+			user_handlers.EndElement(parser, elementname);
 		end
 	elseif (curr_ns ~= xmlns_xep227) or (name ~= "server-data") then
 		io.stderr:write("Unhandled XML element: ", name, "\n");
@@ -237,7 +237,7 @@
 function lxp_handlers.CharacterData(parser, string)
 	if curr_host ~= "" then
 		-- forward to xmlhandlers
-		user_handlers:CharacterData(string);
+		user_handlers.CharacterData(parser, string);
 	end
 end