X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fstanza.lua;h=bf94411556b158c4eab8597cfaaf33d1350cee9b;hb=a945a9ec098199a40e175e351309952950728523;hp=afaf9ce90b47e395d442c30b47a3bf2a95171bbe;hpb=0ef23c673d1d620c9c1cc3e8aed43add63634426;p=prosody.git

diff --git a/util/stanza.lua b/util/stanza.lua
index afaf9ce9..bf944115 100644
--- 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
@@ -319,24 +329,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];
+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
-		local new_table = {};
-		lookup_table[object] = new_table;
-		for index, value in pairs(object) do
-			new_table[_copy(index)] = _copy(value);
-		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