Was a bit hasty to remove send_s2s() from stanza_router. We still use it, and there...

[prosody.git] / util / stanza.lua

diff --git a/util/stanza.lua b/util/stanza.lua
index 06991cda321d12bf18657fe88ad0172842b252ba..3fa8ba662173daafad2ce84f3d22c8a4f011e7bf 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -6,7 +6,14 @@ local setmetatable  =  setmetatable;
 local pairs         =         pairs;
 local ipairs        =        ipairs;
 local type          =          type;
+local next          =          next;
+local print          =          print;
+local unpack        =        unpack;
 local s_gsub        =   string.gsub;
+
+local debug = debug;
+local log = require "util.logger".init("stanza");
+
 module "stanza"
 
 stanza_mt = {};
@@ -22,13 +29,13 @@ function stanza_mt:query(xmlns)
 end
 function stanza_mt:tag(name, attrs)
        local s = stanza(name, attrs);
-       (self.last_add[#self.last_add] or self):add_child(s);
+       (self.last_add[#self.last_add] or self):add_direct_child(s);
        t_insert(self.last_add, s);
        return self;
 end
 
 function stanza_mt:text(text)
-       (self.last_add[#self.last_add] or self):add_child(text);
+       (self.last_add[#self.last_add] or self):add_direct_child(text);
        return self; 
 end
 
@@ -37,13 +44,18 @@ function stanza_mt:up()
        return self;
 end
 
-function stanza_mt:add_child(child)
+function stanza_mt:add_direct_child(child)
        if type(child) == "table" then
                t_insert(self.tags, child);
        end
        t_insert(self, child);
 end
 
+function stanza_mt:add_child(child)
+       (self.last_add[#self.last_add] or self):add_direct_child(child);
+       return self;
+end
+
 function stanza_mt:child_with_name(name)
        for _, child in ipairs(self) do 
                if child.name == name then return child; end
@@ -90,12 +102,11 @@ function stanza_mt.__tostring(t)
        if t.attr then
                for k, v in pairs(t.attr) do if type(k) == "string" then attr_string = attr_string .. s_format(" %s='%s'", k, tostring(v)); end end
        end
-
        return s_format("<%s%s>%s</%s>", t.name, attr_string, children_text, t.name);
 end
 
 function stanza_mt.__add(s1, s2)
-       return s1:add_child(s2);
+       return s1:add_direct_child(s2);
 end
 
 
@@ -107,6 +118,42 @@ do
         end
 end
 
+function preserialize(stanza)
+       local s = { name = stanza.name, attr = stanza.attr };
+       for _, child in ipairs(stanza) do
+               if type(child) == "table" then
+                       t_insert(s, preserialize(child));
+               else
+                       t_insert(s, child);
+               end
+       end
+       return s;
+end
+
+function deserialize(stanza)
+       -- Set metatable
+       if stanza then
+               setmetatable(stanza, stanza_mt);
+               for _, child in ipairs(stanza) do
+                       if type(child) == "table" then
+                               deserialize(child);
+                       end
+               end
+               if not stanza.tags then
+                       -- Rebuild tags
+                       local tags = {};
+                       for _, child in ipairs(stanza) do
+                               if type(child) == "table" then
+                                       t_insert(tags, child);
+                               end
+                       end
+                       stanza.tags = tags;
+               end
+       end
+       
+       return stanza;
+end
+
 function message(attr, body)
        if not body then
                return stanza("message", attr);
@@ -137,4 +184,4 @@ function presence(attr)
        return stanza("presence", attr);
 end
 
-return _M;
\ No newline at end of file
+return _M;