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 c9f8beb6141fcdd77bb58770b9a4ea42b9381d02..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";
@@ -136,8 +138,8 @@ local function readFile(filename)
        while true do
                local tname, tuples = readInsert();
                if tname then
-                       if t[name] then
-                               local t_name = t[name];
+                       if t[tname] then
+                               local t_name = t[tname];
                                for i=1,#tuples do
                                        table.insert(t_name, tuples[i]);
                                end
@@ -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)
@@ -278,6 +280,18 @@ function roster_group(node, host, jid, group)
        local ret, err = dm.store(node, host, "roster", roster);
        print("["..(err or "success").."] roster-group: " ..node.."@"..host.." - "..jid.." - "..group);
 end
+function private_storage(node, host, xmlns, stanza)
+       local private = dm.load(node, host, "private") or {};
+       private[stanza.name..":"..xmlns] = st.preserialize(stanza);
+       local ret, err = dm.store(node, host, "private", private);
+       print("["..(err or "success").."] private: " ..node.."@"..host.." - "..xmlns);
+end
+function offline_msg(node, host, t, stanza)
+       stanza.attr.stamp = os.date("!%Y-%m-%dT%H:%M:%SZ", t);
+       stanza.attr.stamp_legacy = os.date("!%Y%m%dT%H:%M:%S", t);
+       local ret, err = dm.list_append(node, host, "offline", st.preserialize(stanza));
+       print("["..(err or "success").."] offline: " ..node.."@"..host.." - "..os.date("!%Y-%m-%dT%H:%M:%SZ", t));
+end
 for i, row in ipairs(t["rosterusers"] or NULL) do
        local node, contact = row.username, row.jid;
        local name = row.nick;
@@ -310,3 +324,25 @@ end
 for i, row in ipairs(t["rostergroups"] or NULL) do
        roster_group(row.username, host, row.jid, row.grp);
 end
+for i, row in ipairs(t["vcard"] or NULL) do
+       local ret, err = dm.store(row.username, host, "vcard", st.preserialize(parse_xml(row.vcard)));
+       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, 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
+local date_parse = function(s)
+       local year, month, day, hour, min, sec = s:match("(....)-?(..)-?(..)T(..):(..):(..)");
+       return os.time({year=year, month=month, day=day, hour=hour, min=min, sec=sec-time_offset});
+end
+for i, row in ipairs(t["spool"] or NULL) do
+       local stanza = parse_xml(row.xml);
+       local last_child = stanza.tags[#stanza.tags];
+       if not last_child or last_child ~= stanza[#stanza] then error("Last child of offline message is not a tag"); end
+       if last_child.name ~= "x" and last_child.attr.xmlns ~= "jabber:x:delay" then error("Last child of offline message is not a timestamp"); end
+       stanza[#stanza], stanza.tags[#stanza.tags] = nil, nil;
+       local t = date_parse(last_child.attr.stamp);
+       offline_msg(row.username, host, t, stanza);
+end