X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tools%2Fejabberd2prosody.lua;h=590145cdf75cb847d3a818c279631f532d9af154;hb=6ffc2add3cf85b642f91be991d083398e536a816;hp=a8bfad0e059d99da7ade7d6cb801ae89f1178bc9;hpb=13364cc23cfd0d1a2870ffe5d3e7d5a777b324be;p=prosody.git

diff --git a/tools/ejabberd2prosody.lua b/tools/ejabberd2prosody.lua
index a8bfad0e..590145cd 100755
--- a/tools/ejabberd2prosody.lua
+++ b/tools/ejabberd2prosody.lua
@@ -2,7 +2,7 @@
 -- Prosody IM
 -- Copyright (C) 2008-2010 Matthew Wild
 -- Copyright (C) 2008-2010 Waqas Hussain
--- 
+--
 -- This project is MIT/X11 licensed. Please see the
 -- COPYING file in the source package for more information.
 --
@@ -30,7 +30,7 @@ dm.set_data_path("data");
 
 function build_stanza(tuple, stanza)
 	assert(type(tuple) == "table", "XML node is of unexpected type: "..type(tuple));
-	if tuple[1] == "xmlelement" then
+	if tuple[1] == "xmlelement" or tuple[1] == "xmlel" then
 		assert(type(tuple[2]) == "string", "element name has type: "..type(tuple[2]));
 		assert(type(tuple[3]) == "table", "element attribute array has type: "..type(tuple[3]));
 		assert(type(tuple[4]) == "table", "element children array has type: "..type(tuple[4]));
@@ -44,8 +44,10 @@ function build_stanza(tuple, stanza)
 		for _, a in ipairs(tuple[4]) do build_stanza(a, stanza); end
 		if up then stanza:up(); else return stanza end
 	elseif tuple[1] == "xmlcdata" then
-		assert(type(tuple[2]) == "string", "XML CDATA has unexpected type: "..type(tuple[2]));
-		stanza:text(tuple[2]);
+		if type(tuple[2]) ~= "table" then
+			assert(type(tuple[2]) == "string", "XML CDATA has unexpected type: "..type(tuple[2]));
+			stanza:text(tuple[2]);
+		end -- else it's [], i.e., the null value, used for the empty string
 	else
 		error("unknown element type: "..serialize(tuple));
 	end
@@ -54,6 +56,16 @@ function build_time(tuple)
 	local Megaseconds,Seconds,Microseconds = unpack(tuple);
 	return Megaseconds * 1000000 + Seconds;
 end
+function build_jid(tuple, full)
+	local node, jid, resource = tuple[1], tuple[2], tuple[3]
+	if type(node) == "string" and node ~= "" then
+		jid = tuple[1] .. "@" .. jid;
+	end
+	if full and type(resource) == "string" and resource ~= "" then
+		jid = jid .. "/" .. resource;
+	end
+	return jid;
+end
 
 function vcard(node, host, stanza)
 	local ret, err = dm.store(node, host, "vcard", st.preserialize(stanza));
@@ -103,10 +115,7 @@ function privacy(node, host, default, lists)
 				if _type == "jid" then
 					if type(value) ~= "table" then print("[error] privacy: jid value is not valid: "..tostring(value)); break; end
 					local _node, _host, _resource = value[1], value[2], value[3];
-					if (type(_node) == "table") then _node = nil; end
-					if (type(_host) == "table") then _host = nil; end
-					if (type(_resource) == "table") then _resource = nil; end
-					value = (_node and _node.."@".._host or _host)..(_resource and "/".._resource or "");
+					value = build_jid(value, true)
 				elseif _type == "none" then
 					_type = nil;
 					value = nil;
@@ -152,18 +161,10 @@ function privacy(node, host, default, lists)
 	local ret, err = dm.store(node, host, "privacy", privacy);
 	print("["..(err or "success").."] privacy: " ..node.."@"..host.." - "..count.." list(s)");
 end
-local function _table_to_jid(t)
-	if type(t[2]) == "string" then
-		local jid = t[2];
-		if type(t[1]) == "string" then jid = t[1].."@"..jid; end
-		if type(t[3]) == "string" then jid = jid.."/"..t[3]; end
-		return jid;
-	end
-end
 function muc_room(node, host, properties)
 	local store = { jid = node.."@"..host, _data = {}, _affiliations = {} };
 	for _,aff in ipairs(properties.affiliations) do
-		store._affiliations[_table_to_jid(aff[1])] = aff[2];
+		store._affiliations[build_jid(aff[1])] = aff[2][1] or aff[2];
 	end
 	store._data.subject = properties.subject;
 	if properties.subject_author then
@@ -205,7 +206,7 @@ local filters = {
 	end;
 	roster = function(tuple)
 		local node = tuple[3][1]; local host = tuple[3][2];
-		local contact = (type(tuple[4][1]) == "table") and tuple[4][2] or tuple[4][1].."@"..tuple[4][2];
+		local contact = build_jid(tuple[4]);
 		local name = tuple[5]; local subscription = tuple[6];
 		local ask = tuple[7]; local groups = tuple[8];
 		if type(name) ~= type("") then name = nil; end
@@ -247,7 +248,7 @@ local filters = {
 		end
 		muc_room(tuple[2][1], tuple[2][2], properties);
 	end;
-	config = function(tuple)
+	--[=[config = function(tuple)
 		if tuple[2] == "hosts" then
 			local output = io.output(); io.output("prosody.cfg.lua");
 			io.write("-- Configuration imported from ejabberd --\n");
@@ -275,7 +276,7 @@ local filters = {
 			io.output(output);
 			print("prosody.cfg.lua created");
 		end
-	end;
+	end;]=]
 };
 
 local arg = ...;