Fix the JsonStore path set problem justincc found earlier today and

remove the deprecated TestPath functions.

1 files changed, 3 insertions, 25 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;