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

* Added some more tests to the GetAssetStreamHandlers

Browse Source
This commit is contained in:
lbsa71
2009-05-13 17:11:53 +00:00
parent b95b7222f9
commit 40e95cab02
12 changed files with 386 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

43
OpenSim/Framework/Servers/BaseGetAssetStreamHandler.cs
View File

@@ -60,7 +60,7 @@ namespace OpenSim.Framework.Servers
if (p.Length > 0)
{
UUID assetID = UUID.Zero;
UUID assetID;
if (!UUID.TryParse(p[0], out assetID))
{
@@ -70,16 +70,14 @@ namespace OpenSim.Framework.Servers
}
if (StatsManager.AssetStats != null)
{
StatsManager.AssetStats.AddRequest();
}
AssetBase asset = GetAsset(assetID);
if (asset != null)
{
// if (asset.ContainsReferences)
// {
// asset.Data = ProcessOutgoingAssetData(asset.Data);
// }
if (p.Length > 1 && p[1] == "data")
{
httpResponse.StatusCode = (int)HttpStatusCode.OK;
@@ -88,25 +86,15 @@ namespace OpenSim.Framework.Servers
}
else
{
XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
MemoryStream ms = new MemoryStream();
XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
xw.Formatting = Formatting.Indented;
xs.Serialize(xw, asset);
xw.Flush();
ms.Seek(0, SeekOrigin.Begin);
//StreamReader sr = new StreamReader(ms);
result = ms.GetBuffer();
Array.Resize<byte>(ref result, (int)ms.Length);
result = GetXml(asset);
}
}
else
{
if (StatsManager.AssetStats != null)
{
StatsManager.AssetStats.AddNotFoundRequest();
}
m_log.InfoFormat("[REST]: GET:/asset failed to find {0}", assetID);
}
@@ -115,6 +103,25 @@ namespace OpenSim.Framework.Servers
return result;
}
public static byte[] GetXml(AssetBase asset)
{
byte[] result;
XmlSerializer xs = new XmlSerializer(typeof(AssetBase));
MemoryStream ms = new MemoryStream();
XmlTextWriter xw = new XmlTextWriter(ms, Encoding.UTF8);
xw.Formatting = Formatting.Indented;
xs.Serialize(xw, asset);
xw.Flush();
ms.Seek(0, SeekOrigin.Begin);
//StreamReader sr = new StreamReader(ms);
result = ms.GetBuffer();
Array.Resize<byte>(ref result, (int)ms.Length);
return result;
}
public string ProcessAssetDataString(string data)
{
Regex regex = new Regex("(creator_id|owner_id)\\s+(\\S+)");