1 files changed, 43 insertions, 35 deletions

diff --git a/OpenSim/Services/InventoryService/InventoryServiceBase.cs b/OpenSim/Data/Null/NullXGroupData.cs
index 456e455..7a86b9f 100644
--- a/OpenSim/Services/InventoryService/InventoryServiceBase.cs
+++ b/OpenSim/Data/Null/NullXGroupData.cs
@@ -26,57 +26,65 @@
  */
 
 using System;
+using System.Collections;
 using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
-using Nini.Config;
+using System.Threading;
+using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
 using OpenSim.Data;
-using OpenSim.Services.Interfaces;
-using OpenSim.Services.Base;
 
-namespace OpenSim.Services.InventoryService
+namespace OpenSim.Data.Null
 {
-    public class InventoryServiceBase : ServiceBase
+    public class NullXGroupData : NullGenericDataHandler, IXGroupData
     {
-        protected IInventoryDataPlugin m_Database = null;
+//        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
 
-        public InventoryServiceBase(IConfigSource config) : base(config)
-        {
-            string dllName = String.Empty;
-            string connString = String.Empty;
+        private Dictionary<UUID, XGroup> m_groups = new Dictionary<UUID, XGroup>();
+
+        public NullXGroupData(string connectionString, string realm) {}
 
-            //
-            // Try reading the [DatabaseService] section first, if it exists
-            //
-            IConfig dbConfig = config.Configs["DatabaseService"];
-            if (dbConfig != null)
+        public bool StoreGroup(XGroup group)
+        {
+            lock (m_groups)
             {
-                dllName = dbConfig.GetString("StorageProvider", String.Empty);
-                connString = dbConfig.GetString("ConnectionString", String.Empty);
+                m_groups[group.groupID] = group.Clone();
             }
 
-            //
-            // Try reading the more specific [InventoryService] section, if it exists
-            //
-            IConfig inventoryConfig = config.Configs["InventoryService"];
-            if (inventoryConfig != null)
+            return true;
+        }
+
+        public XGroup[] GetGroups(string field, string val)
+        {
+            return GetGroups(new string[] { field }, new string[] { val });
+        }
+
+        public XGroup[] GetGroups(string[] fields, string[] vals)
+        {
+            lock (m_groups)
             {
-                dllName = inventoryConfig.GetString("StorageProvider", dllName);
-                connString = inventoryConfig.GetString("ConnectionString", connString);
+                List<XGroup> origGroups = Get<XGroup>(fields, vals, m_groups.Values.ToList());
+
+                return origGroups.Select(g => g.Clone()).ToArray();
             }
+        }
 
-            //
-            // We tried, but this doesn't exist. We can't proceed.
-            //
-            if (dllName.Equals(String.Empty))
-                throw new Exception("No InventoryService configuration");
+        public bool DeleteGroups(string field, string val)
+        {
+            return DeleteGroups(new string[] { field }, new string[] { val });
+        }
 
-            m_Database = LoadPlugin<IInventoryDataPlugin>(dllName);
-            if (m_Database == null)
-                throw new Exception("Could not find a storage interface in the given module");
+        public bool DeleteGroups(string[] fields, string[] vals)
+        {
+            lock (m_groups)
+            {
+                XGroup[] groupsToDelete = GetGroups(fields, vals);
+                Array.ForEach(groupsToDelete, g => m_groups.Remove(g.groupID));
+            }
 
-            m_Database.Initialise(connString);
+            return true;
         }
-
     }
-}
+}
\ No newline at end of file