ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 17:32:42 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix the JsonStore path set problem justincc found earlier today and

Browse Source 
remove the deprecated TestPath functions.
This commit is contained in:
Mic Bowman
2013-02-19 22:53:46 -08:00
parent 4779f7d7d5
commit 903b40b47e
4 changed files with 3 additions and 96 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
OpenSim/Region/OptionalModules/Scripting/JsonStore/JsonStore.cs
View File

@@ -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>
@@ -168,28 +168,6 @@ namespace OpenSim.Region.OptionalModules.Scripting.JsonStore
return JsonStoreNodeType.Undefined;
}
// -----------------------------------------------------------------
/// <summary>
///
/// </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>
///