net.httpserver: Revert commit eccd3c87d717 which has since been fixed in a better way

[prosody.git] / tools / ejabberdsql2prosody.lua

diff --git a/tools/ejabberdsql2prosody.lua b/tools/ejabberdsql2prosody.lua
index c517b2106b2b9e8ebf40e6b5cb550ba6ff961beb..958cf0e2d1c97ec027e7bb71ab4dcab684f6f890 100644 (file)
--- a/tools/ejabberdsql2prosody.lua
+++ b/tools/ejabberdsql2prosody.lua
@@ -1,12 +1,14 @@
 #!/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.
 --
 
+prosody = {};
+
 package.path = package.path ..";../?.lua";
 local serialize = require "util.serialization".serialize;
 local st = require "util.stanza";
@@ -254,7 +256,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 +329,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