Fix the JsonStore path set problem justincc found earlier today and

remove the deprecated TestPath functions.

3 files changed, 3 insertions, 95 deletions

diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
index ca3989a..40adba1 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
@@ -84,11 +84,11 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         protected static Regex m_PathComponent = new Regex("\\.({[^}]+}|\\[[0-9]+\\]|\\[\\+\\])");
 
         // extract the internals of an array reference
-        protected static Regex m_SimpleArrayPattern = new Regex("\\[([0-9]+)\\]");
-        protected static Regex m_ArrayPattern = new Regex("\\[([0-9]+|\\+)\\]");
+        protected static Regex m_SimpleArrayPattern = new Regex("^\\[([0-9]+)\\]$");
+        protected static Regex m_ArrayPattern = new Regex("^\\[([0-9]+|\\+)\\]$");
 
         // extract the internals of a has reference
-        protected static Regex m_HashPattern = new Regex("{([^}]+)}");
+        protected static Regex m_HashPattern = new Regex("^{([^}]+)}$");
 
         // -----------------------------------------------------------------
         /// <summary>
@@ -173,28 +173,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         /// 
         /// </summary>
         // -----------------------------------------------------------------
-        public bool TestPath(string expr, bool useJson)
-        {
-            Stack<string> path;
-            if (! ParsePathExpression(expr,out path))
-                return false;
-            
-            OSD result = ProcessPathExpression(ValueStore,path);
-
-            if (result == null)
-                return false;
-            
-            if (useJson || OSDBaseType(result.Type))
-                return true;
-            
-            return false;
-        }
-        
-        // -----------------------------------------------------------------
-        /// <summary>
-        /// 
-        /// </summary>
-        // -----------------------------------------------------------------
         public int ArrayLength(string expr)
         {
             Stack<string> path;
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
index fb35068..e78a2f4 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreModule.cs
@@ -302,38 +302,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
         /// 
         /// </summary>
         // -----------------------------------------------------------------
-        public bool TestPath(UUID storeID, string path, bool useJson)
-        {
-            if (! m_enabled) return false;
-
-            JsonStore map = null;
-            lock (m_JsonValueStore)
-            {
-                if (! m_JsonValueStore.TryGetValue(storeID,out map))
-                {
-                    m_log.InfoFormat("[JsonStore] Missing store {0}",storeID);
-                    return false;
-                }
-            }
-            
-            try
-            {
-                lock (map)
-                    return map.TestPath(path,useJson);
-            }
-            catch (Exception e)
-            {
-                m_log.Error(string.Format("[JsonStore]: Path test failed for {0} in {1}", path, storeID), e);
-            }
-
-            return false;
-        }
-
-        // -----------------------------------------------------------------
-        /// <summary>
-        /// 
-        /// </summary>
-        // -----------------------------------------------------------------
         public bool SetValue(UUID storeID, string path, string value, bool useJson)
         {
             if (! m_enabled) return false;
diff --git a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
index ef08c05..e13eb56 100644
--- a/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
+++ b/OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStoreScriptModule.cs
@@ -168,32 +168,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
                 {
                     m_comms.RegisterScriptInvocations(this);
                     m_comms.RegisterConstants(this);
-        
-                    // m_comms.RegisterScriptInvocation(this, "JsonCreateStore");
-                    // m_comms.RegisterScriptInvocation(this, "JsonAttachObjectStore");
-                    // m_comms.RegisterScriptInvocation(this, "JsonDestroyStore");
-                    // m_comms.RegisterScriptInvocation(this, "JsonTestStore");
-
-                    // m_comms.RegisterScriptInvocation(this, "JsonReadNotecard");
-                    // m_comms.RegisterScriptInvocation(this, "JsonWriteNotecard");
-
-                    // m_comms.RegisterScriptInvocation(this, "JsonTestPathList");
-                    // m_comms.RegisterScriptInvocation(this, "JsonTestPath");
-                    // m_comms.RegisterScriptInvocation(this, "JsonTestPathJson");
-
-                    // m_comms.RegisterScriptInvocation(this, "JsonGetValue");
-                    // m_comms.RegisterScriptInvocation(this, "JsonGetValueJson");
-
-                    // m_comms.RegisterScriptInvocation(this, "JsonTakeValue");
-                    // m_comms.RegisterScriptInvocation(this, "JsonTakeValueJson");
-
-                    // m_comms.RegisterScriptInvocation(this, "JsonReadValue");
-                    // m_comms.RegisterScriptInvocation(this, "JsonReadValueJson");
-
-                    // m_comms.RegisterScriptInvocation(this, "JsonSetValue");
-                    // m_comms.RegisterScriptInvocation(this, "JsonSetValueJson");
-
-                    // m_comms.RegisterScriptInvocation(this, "JsonRemoveValue");
                 }
                 catch (Exception e)
                 {
@@ -341,18 +315,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
             return (int)m_store.GetPathType(storeID,path);
         }
 
-        [ScriptInvocation]
-        public int JsonTestPath(UUID hostID, UUID scriptID, UUID storeID, string path)
-        {
-            return m_store.TestPath(storeID,path,false) ? 1 : 0;
-        }
-
-        [ScriptInvocation]
-        public int JsonTestPathJson(UUID hostID, UUID scriptID, UUID storeID, string path)
-        {
-            return m_store.TestPath(storeID,path,true) ? 1 : 0;
-        }
-
         // -----------------------------------------------------------------
         /// <summary>
         ///