X-Git-Url: https://git.enpas.org/?a=blobdiff_plain;f=util%2Fmultitable.lua;h=66b9bd8aba1a90481d80efcaa056773552a61f60;hb=492c253d150aeb7edb6687eb9bf085be6c33133a;hp=1e22c4dddef38a99095d4fa4ad445d9a47d90ad5;hpb=5ec2d0b80d4c051f39c612e101a354841cba240a;p=prosody.git

diff --git a/util/multitable.lua b/util/multitable.lua
index 1e22c4dd..66b9bd8a 100644
--- a/util/multitable.lua
+++ b/util/multitable.lua
@@ -1,20 +1,9 @@
--- Prosody IM v0.1
--- Copyright (C) 2008 Matthew Wild
--- Copyright (C) 2008 Waqas Hussain
+-- Prosody IM
+-- Copyright (C) 2008-2010 Matthew Wild
+-- Copyright (C) 2008-2010 Waqas Hussain
 -- 
--- This program is free software; you can redistribute it and/or
--- modify it under the terms of the GNU General Public License
--- as published by the Free Software Foundation; either version 2
--- of the License, or (at your option) any later version.
--- 
--- This program is distributed in the hope that it will be useful,
--- but WITHOUT ANY WARRANTY; without even the implied warranty of
--- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
--- GNU General Public License for more details.
--- 
--- You should have received a copy of the GNU General Public License
--- along with this program; if not, write to the Free Software
--- Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+-- This project is MIT/X11 licensed. Please see the
+-- COPYING file in the source package for more information.
 --
 
 
@@ -47,16 +36,27 @@ local function add(self, ...)
 	t_insert(t, (select(count, ...)));
 end
 
+local function set(self, ...)
+	local t = self.data;
+	local count = select('#', ...);
+	for n = 1,count-2 do
+		local key = select(n, ...);
+		local tab = t[key];
+		if not tab then tab = {}; t[key] = tab; end
+		t = tab;
+	end
+	t[(select(count-1, ...))] = (select(count, ...));
+end
+
 local function r(t, n, _end, ...)
 	if t == nil then return; end
-	if n > _end then
-		for key in pairs(t) do
-			t[key] = nil;
-		end
-	end
 	local k = select(n, ...);
+	if n == _end then
+		t[k] = nil;
+		return;
+	end
 	if k then
-		v = t[k];
+		local v = t[k];
 		if v then
 			r(v, n+1, _end, ...);
 			if not next(v) then
@@ -82,12 +82,62 @@ local function remove(self, ...)
 end
 
 
+local function s(t, n, results, _end, ...)
+	if t == nil then return; end
+	local k = select(n, ...);
+	if n == _end then
+		if k == nil then
+			for _, v in pairs(t) do
+				t_insert(results, v);
+			end
+		else
+			t_insert(results, t[k]);
+		end
+		return;
+	end
+	if k then
+		local v = t[k];
+		if v then
+			s(v, n+1, results, _end, ...);
+		end
+	else
+		for _,b in pairs(t) do
+			s(b, n+1, results, _end, ...);
+		end
+	end
+end
+
+-- Search for keys, nil == wildcard
+local function search(self, ...)
+	local _end = select('#', ...);
+	for n = _end,1 do
+		if select(n, ...) then _end = n; break; end
+	end
+	local results = {};
+	s(self.data, 1, results, _end, ...);
+	return results;
+end
+
+-- Append results to an existing list
+local function search_add(self, results, ...)
+	if not results then results = {}; end
+	local _end = select('#', ...);
+	for n = _end,1 do
+		if select(n, ...) then _end = n; break; end
+	end
+	s(self.data, 1, results, _end, ...);
+	return results;
+end
+
 function new()
 	return {
 		data = {};
 		get = get;
 		add = add;
+		set = set;
 		remove = remove;
+		search = search;
+		search_add = search_add;
 	};
 end