From 7c6ef95f2f8a4fb06a1359e9625e80e4cb216a5d Mon Sep 17 00:00:00 2001 From: Jeff Ames Date: Mon, 29 Oct 2007 07:57:38 +0000 Subject: normalized line endings --- OpenSim/Grid/AssetServer/RestService.cs | 218 ++++++++++++++++---------------- 1 file changed, 109 insertions(+), 109 deletions(-) (limited to 'OpenSim/Grid/AssetServer/RestService.cs') diff --git a/OpenSim/Grid/AssetServer/RestService.cs b/OpenSim/Grid/AssetServer/RestService.cs index 88a1668..e4f770d 100644 --- a/OpenSim/Grid/AssetServer/RestService.cs +++ b/OpenSim/Grid/AssetServer/RestService.cs @@ -1,109 +1,109 @@ -using System; -using System.IO; -using System.Xml; -using System.Xml.Serialization; -using System.Text; - -using libsecondlife; -using OpenSim.Framework.Types; -using OpenSim.Framework.Servers; -using OpenSim.Framework.Interfaces; -using OpenSim.Framework.Console; - -namespace OpenSim.Grid.AssetServer -{ - public class GetAssetStreamHandler : BaseStreamHandler - { - OpenAsset_Main m_assetManager; - IAssetProvider m_assetProvider; - - override public byte[] Handle(string path, Stream request) - { - string param = GetParam(path); - byte[] result = new byte[] { }; - try { - - string[] p = param.Split(new char[] { '/', '?', '&' }, StringSplitOptions.RemoveEmptyEntries); - - if (p.Length > 0) - { - LLUUID assetID; - bool isTexture = false; - LLUUID.TryParse(p[0], out assetID); - if (p.Length > 1) - { - if (string.Compare(p[1], "texture", true) == 0) - isTexture = true; - } - - - AssetBase asset = m_assetProvider.FetchAsset(assetID); - if (asset != null) - { - MainLog.Instance.Debug("REST", "GET:/asset found {0}, {1}", assetID, asset.Name); - - 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(ref result, (int)ms.Length); - } - else - { - MainLog.Instance.Verbose("REST", "GET:/asset failed to find {0}", assetID); - } - } - } - catch (Exception e) - { - MainLog.Instance.Error(e.ToString()); - } - return result; - } - - public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider) - : base("GET", "/assets" ) - { - m_assetManager = assetManager; - m_assetProvider = assetProvider; - } - } - - public class PostAssetStreamHandler : BaseStreamHandler - { - OpenAsset_Main m_assetManager; - IAssetProvider m_assetProvider; - - override public byte[] Handle(string path, Stream request) - { - string param = GetParam(path); - - LLUUID assetId; - if(param.Length > 0) - LLUUID.TryParse(param, out assetId); - byte[] txBuffer = new byte[4096]; - - XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); - AssetBase asset = (AssetBase)xs.Deserialize(request); - - MainLog.Instance.Verbose("REST", "StoreAndCommitAsset {0}", asset.FullID); - m_assetProvider.CreateAsset(asset); - - return new byte[] { }; - } - - public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider) - : base("POST", "/assets") - { - m_assetManager = assetManager; - m_assetProvider = assetProvider; - } - } -} +using System; +using System.IO; +using System.Xml; +using System.Xml.Serialization; +using System.Text; + +using libsecondlife; +using OpenSim.Framework.Types; +using OpenSim.Framework.Servers; +using OpenSim.Framework.Interfaces; +using OpenSim.Framework.Console; + +namespace OpenSim.Grid.AssetServer +{ + public class GetAssetStreamHandler : BaseStreamHandler + { + OpenAsset_Main m_assetManager; + IAssetProvider m_assetProvider; + + override public byte[] Handle(string path, Stream request) + { + string param = GetParam(path); + byte[] result = new byte[] { }; + try { + + string[] p = param.Split(new char[] { '/', '?', '&' }, StringSplitOptions.RemoveEmptyEntries); + + if (p.Length > 0) + { + LLUUID assetID; + bool isTexture = false; + LLUUID.TryParse(p[0], out assetID); + if (p.Length > 1) + { + if (string.Compare(p[1], "texture", true) == 0) + isTexture = true; + } + + + AssetBase asset = m_assetProvider.FetchAsset(assetID); + if (asset != null) + { + MainLog.Instance.Debug("REST", "GET:/asset found {0}, {1}", assetID, asset.Name); + + 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(ref result, (int)ms.Length); + } + else + { + MainLog.Instance.Verbose("REST", "GET:/asset failed to find {0}", assetID); + } + } + } + catch (Exception e) + { + MainLog.Instance.Error(e.ToString()); + } + return result; + } + + public GetAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider) + : base("GET", "/assets" ) + { + m_assetManager = assetManager; + m_assetProvider = assetProvider; + } + } + + public class PostAssetStreamHandler : BaseStreamHandler + { + OpenAsset_Main m_assetManager; + IAssetProvider m_assetProvider; + + override public byte[] Handle(string path, Stream request) + { + string param = GetParam(path); + + LLUUID assetId; + if(param.Length > 0) + LLUUID.TryParse(param, out assetId); + byte[] txBuffer = new byte[4096]; + + XmlSerializer xs = new XmlSerializer(typeof(AssetBase)); + AssetBase asset = (AssetBase)xs.Deserialize(request); + + MainLog.Instance.Verbose("REST", "StoreAndCommitAsset {0}", asset.FullID); + m_assetProvider.CreateAsset(asset); + + return new byte[] { }; + } + + public PostAssetStreamHandler(OpenAsset_Main assetManager, IAssetProvider assetProvider) + : base("POST", "/assets") + { + m_assetManager = assetManager; + m_assetProvider = assetProvider; + } + } +} -- cgit v1.1