OpenSim
/
OpenSimMirror
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

* Use the UUID regex sitting in utils for detection of uuids embedded in scripts 

* Replaces the one in the module itself, which had a dumb bug in it anyway
0.6.0-stable
Justin Clarke Casey 2008-11-03 16:57:03 +00:00
parent d6d2a38e76
commit 57caef119c
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
OpenSim/Framework/Util.cs
View File

@ -64,7 +64,8 @@ namespace OpenSim.Framework
private static readonly DateTime unixEpoch = private static readonly DateTime unixEpoch =
DateTime.ParseExact("1970-01-01 00:00:00 +0", "yyyy-MM-dd hh:mm:ss z", DateTimeFormatInfo.InvariantInfo).ToUniversalTime(); DateTime.ParseExact("1970-01-01 00:00:00 +0", "yyyy-MM-dd hh:mm:ss z", DateTimeFormatInfo.InvariantInfo).ToUniversalTime();
private static readonly Regex UUIDPattern = new Regex("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$"); public static readonly Regex UUIDPattern
= new Regex("^[0-9a-fA-F]{8}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{4}-[0-9a-fA-F]{12}$");
#region Vector Equations #region Vector Equations
@ -799,6 +800,11 @@ namespace OpenSim.Framework
y += ry; y += ry;
} }
/// <summary>
/// Is the given string a UUID?
/// </summary>
/// <param name="s"></param>
/// <returns></returns>
public static bool isUUID(string s) public static bool isUUID(string s)
{ {
return UUIDPattern.IsMatch(s); return UUIDPattern.IsMatch(s);

10
OpenSim/Region/Environment/Modules/World/Archiver/ArchiveWriteRequestPreparation.cs
View File

@ -53,14 +53,6 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
protected Scene m_scene; protected Scene m_scene;
protected string m_savePath; protected string m_savePath;
/// <summary>
/// Used for identifying uuids embedded in scripts
/// </summary>
protected static readonly Regex m_uuidRegex
= new Regex(
"[0-9a-eA-E]{8}-[0-9a-eA-E]{4}-[0-9a-eA-E]{4}-[0-9a-eA-E]{4}-[0-9a-eA-E]{12}",
RegexOptions.Compiled);
/// <summary> /// <summary>
/// Used as a temporary store of an asset which represents an object. This can be a null if no appropriate /// Used as a temporary store of an asset which represents an object. This can be a null if no appropriate
/// asset was found by the asset service. /// asset was found by the asset service.
@ -136,7 +128,7 @@ namespace OpenSim.Region.Environment.Modules.World.Archiver
{ {
string script = Utils.BytesToString(scriptAsset.Data); string script = Utils.BytesToString(scriptAsset.Data);
//m_log.DebugFormat("[ARCHIVER]: Script {0}", script); //m_log.DebugFormat("[ARCHIVER]: Script {0}", script);
MatchCollection uuidMatches = m_uuidRegex.Matches(script); MatchCollection uuidMatches = Util.UUIDPattern.Matches(script);
//m_log.DebugFormat("[ARCHIVER]: Found {0} matches in script", uuidMatches.Count); //m_log.DebugFormat("[ARCHIVER]: Found {0} matches in script", uuidMatches.Count);
foreach (Match uuidMatch in uuidMatches) foreach (Match uuidMatch in uuidMatches)