Comparison

util/stanza.lua @ 2736:27e8452cb426

Merge with 0.7
author Matthew Wild <mwild1@gmail.com>
date Mon, 01 Mar 2010 21:03:17 +0000
parent 2734:7941617b15f9
child 2925:692b3c6c5bd2
comparison
equal deleted inserted replaced
2730:dea5a65b321d 2736:27e8452cb426
245 if stanza then 245 if stanza then
246 local attr = stanza.attr; 246 local attr = stanza.attr;
247 for i=1,#attr do attr[i] = nil; end 247 for i=1,#attr do attr[i] = nil; end
248 local attrx = {}; 248 local attrx = {};
249 for att in pairs(attr) do 249 for att in pairs(attr) do
250 if s_find(att, "|", 1, true) and not s_find(k, "\1", 1, true) then 250 if s_find(att, "|", 1, true) and not s_find(att, "\1", 1, true) then
251 local ns,na = s_match(k, "^([^|]+)|(.+)$"); 251 local ns,na = s_match(att, "^([^|]+)|(.+)$");
252 attrx[ns.."\1"..na] = attr[att]; 252 attrx[ns.."\1"..na] = attr[att];
253 attr[att] = nil; 253 attr[att] = nil;
254 end 254 end
255 end 255 end
256 for a,v in pairs(attrx) do 256 for a,v in pairs(attrx) do
257 attr[x] = v; 257 attr[a] = v;
258 end 258 end
259 setmetatable(stanza, stanza_mt); 259 setmetatable(stanza, stanza_mt);
260 for _, child in ipairs(stanza) do 260 for _, child in ipairs(stanza) do
261 if type(child) == "table" then 261 if type(child) == "table" then
262 deserialize(child); 262 deserialize(child);