X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=tools%2Fejabberdsql2prosody.lua;h=5b9752692eea59d272c8257b188ae7474851fb92;hb=d2a52ca2a03f74964b3c54e05d22fb650327f9a1;hp=def3a907351f693863d756bed573657ad3a73aa5;hpb=d7563fd6f04b7a307ee1aa4fdc557e104b8a4dad;p=prosody.git

diff --git a/tools/ejabberdsql2prosody.lua b/tools/ejabberdsql2prosody.lua
index def3a907..5b975269 100644
--- a/tools/ejabberdsql2prosody.lua
+++ b/tools/ejabberdsql2prosody.lua
@@ -136,7 +136,14 @@ local function readFile(filename)
 	while true do
 		local tname, tuples = readInsert();
 		if tname then
-			t[tname] = tuples;
+			if t[name] then
+				local t_name = t[name];
+				for i=1,#tuples do
+					table.insert(t_name, tuples[i]);
+				end
+			else
+				t[tname] = tuples;
+			end
 		elseif peek() == nil then
 			break;
 		end
@@ -214,7 +221,7 @@ end
 function roster_group(node, host, jid, group)
 	local roster = dm.load(node, host, "roster") or {};
 	local item = roster[jid];
-	if not item then print("Warning: No roster item "..jid.." for user "..user..", can't put in group "..group); return; end
+	if not item then print("Warning: No roster item "..jid.." for user "..node..", can't put in group "..group); return; end
 	item.groups[group] = true;
 	local ret, err = dm.store(node, host, "roster", roster);
 	print("["..(err or "success").."] roster-group: " ..node.."@"..host.." - "..jid.." - "..group);