util.pluginloader: Return full file path from internal file loader on success, not...

[prosody.git] / util / stanza.lua

diff --git a/util/stanza.lua b/util/stanza.lua
index afaf9ce90b47e395d442c30b47a3bf2a95171bbe..de83977f38fb41d717975b18fbcb3ee29caf01ac 100644 (file)
--- a/util/stanza.lua
+++ b/util/stanza.lua
@@ -44,11 +44,13 @@ module "stanza"
 
 stanza_mt = { __type = "stanza" };
 stanza_mt.__index = stanza_mt;
+local stanza_mt = stanza_mt;
 
 function stanza(name, attr)
        local stanza = { name = name, attr = attr or {}, tags = {} };
        return setmetatable(stanza, stanza_mt);
 end
+local stanza = stanza;
 
 function stanza_mt:query(xmlns)
        return self:tag("query", { xmlns = xmlns });
@@ -108,6 +110,14 @@ function stanza_mt:get_child(name, xmlns)
        end
 end
 
+function stanza_mt:get_child_text(name, xmlns)
+       local tag = self:get_child(name, xmlns);
+       if tag then
+               return tag:get_text();
+       end
+       return nil;
+end
+
 function stanza_mt:child_with_name(name)
        for _, child in ipairs(self.tags) do
                if child.name == name then return child; end
@@ -128,29 +138,20 @@ function stanza_mt:children()
                end, self, i;
 end
 
-function stanza_mt:matching_tags(name, xmlns)
+function stanza_mt:childtags(name, xmlns)
        xmlns = xmlns or self.attr.xmlns;
        local tags = self.tags;
        local start_i, max_i = 1, #tags;
        return function ()
-                       for i=start_i,max_i do
-                               v = tags[i];
-                               if (not name or v.name == name)
-                               and (not xmlns or xmlns == v.attr.xmlns) then
-                                       start_i = i+1;
-                                       return v;
-                               end
+               for i = start_i, max_i do
+                       local v = tags[i];
+                       if (not name or v.name == name)
+                       and (not xmlns or xmlns == v.attr.xmlns) then
+                               start_i = i+1;
+                               return v;
                        end
-               end, tags, i;
-end
-
-function stanza_mt:childtags()
-       local i = 0;
-       return function (a)
-                       i = i + 1
-                       local v = self.tags[i]
-                       if v then return v; end
-               end, self.tags[1], i;
+               end
+       end;
 end
 
 function stanza_mt:maptags(callback)
@@ -319,24 +320,21 @@ function deserialize(stanza)
        return stanza;
 end
 
-function clone(stanza)
-       local lookup_table = {};
-       local function _copy(object)
-               if type(object) ~= "table" then
-                       return object;
-               elseif lookup_table[object] then
-                       return lookup_table[object];
-               end
-               local new_table = {};
-               lookup_table[object] = new_table;
-               for index, value in pairs(object) do
-                       new_table[_copy(index)] = _copy(value);
+local function _clone(stanza)
+       local attr, tags = {}, {};
+       for k,v in pairs(stanza.attr) do attr[k] = v; end
+       local new = { name = stanza.name, attr = attr, tags = tags };
+       for i=1,#stanza do
+               local child = stanza[i];
+               if child.name then
+                       child = _clone(child);
+                       t_insert(tags, child);
                end
-               return setmetatable(new_table, getmetatable(object));
+               t_insert(new, child);
        end
-       
-       return _copy(stanza)
+       return setmetatable(new, stanza_mt);
 end
+clone = _clone;
 
 function message(attr, body)
        if not body then