X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;ds=inline;f=tools%2Fejabberdsql2prosody.lua;h=ef4706ce81382ae854083d530e615c45c4ba6848;hb=67972219b74e6315bcd23966e3570594e47456e3;hp=c517b2106b2b9e8ebf40e6b5cb550ba6ff961beb;hpb=1fdd3bc55b02f5096fe92404fae51f52af6e8d2e;p=prosody.git

diff --git a/tools/ejabberdsql2prosody.lua b/tools/ejabberdsql2prosody.lua
index c517b210..ef4706ce 100644
--- a/tools/ejabberdsql2prosody.lua
+++ b/tools/ejabberdsql2prosody.lua
@@ -1,7 +1,7 @@
 #!/usr/bin/env lua
 -- Prosody IM
--- Copyright (C) 2008-2009 Matthew Wild
--- Copyright (C) 2008-2009 Waqas Hussain
+-- 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.
@@ -254,7 +254,7 @@ end
 for i, row in ipairs(t["users"] or NULL) do
 	local node, password = row.username, row.password;
 	local ret, err = dm.store(node, host, "accounts", {password = password});
-	print("["..(err or "success").."] accounts: "..node.."@"..host.." = "..password);
+	print("["..(err or "success").."] accounts: "..node.."@"..host);
 end
 
 function roster(node, host, jid, item)
@@ -327,7 +327,7 @@ for i, row in ipairs(t["vcard"] or NULL) do
 	print("["..(err or "success").."] vCard: "..row.username.."@"..host);
 end
 for i, row in ipairs(t["private_storage"] or NULL) do
-	private_storage(row.username, host, row.namespace, st.preserialize(parse_xml(row.data)));
+	private_storage(row.username, host, row.namespace, parse_xml(row.data));
 end
 table.sort(t["spool"] or NULL, function(a,b) return a.seq < b.seq; end); -- sort by sequence number, just in case
 local time_offset = os.difftime(os.time(os.date("!*t")), os.time(os.date("*t"))) -- to deal with timezones