1 files changed, 28 insertions, 52 deletions

diff --git a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs b/OpenSim/Data/Null/NullGenericDataHandler.cs
index d7198f0..dd9d190 100644
--- a/OpenSim/Region/Framework/Scenes/Scripting/NullScriptHost.cs
+++ b/OpenSim/Data/Null/NullGenericDataHandler.cs
@@ -26,66 +26,42 @@
  */
 
 using System;
-using OpenMetaverse;
-using log4net;
+using System.Collections.Generic;
+using System.Linq;
 using System.Reflection;
+using log4net;
+using OpenMetaverse;
 using OpenSim.Framework;
+using OpenSim.Data;
 
-namespace OpenSim.Region.Framework.Scenes.Scripting
+namespace OpenSim.Data.Null
 {
-    public class NullScriptHost : IScriptHost
+    /// <summary>
+    /// Not a proper generic data handler yet - probably needs to actually store the data as well instead of relying
+    /// on descendent classes
+    /// </summary>
+    public class NullGenericDataHandler
     {
-        private static readonly ILog m_log = LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
-
-        private Vector3 m_pos = new Vector3(((int)Constants.RegionSize * 0.5f), ((int)Constants.RegionSize * 0.5f), 30);
-
-        public string Name
-        {
-            get { return "Object"; }
-            set { }
-        }
-
-        public string SitName
+        protected List<T> Get<T>(string[] fields, string[] vals, List<T> inputEntities)
         {
-            get { return String.Empty; }
-            set { }
-        }
+            List<T> entities = inputEntities;
 
-        public string TouchName
-        {
-            get { return String.Empty; }
-            set { }
-        }
+            for (int i = 0; i < fields.Length; i++)
+            {
+                entities
+                    = entities.Where(
+                        e =>
+                        {
+                            FieldInfo fi = typeof(T).GetField(fields[i]);
+                            if (fi == null)
+                                throw new NotImplementedException(string.Format("No field {0} for val {1}", fields[i], vals[i]));
 
-        public string Description
-        {
-            get { return String.Empty; }
-            set { }
-        }
+                            return fi.GetValue(e).ToString() == vals[i];
+                        }
+                    ).ToList();
+            }
 
-        public UUID UUID
-        {
-            get { return UUID.Zero; }
-        }
-
-        public UUID OwnerID
-        {
-            get { return UUID.Zero; }
-        }
-
-        public UUID CreatorID
-        {
-            get { return UUID.Zero; }
-        }
-
-        public Vector3 AbsolutePosition
-        {
-            get { return m_pos; }
-        }
-
-        public void SetText(string text, Vector3 color, double alpha)
-        {
-            m_log.Warn("Tried to SetText "+text+" on NullScriptHost");
+            return entities;
         }
     }
-}
+}
\ No newline at end of file