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

this add POST support for asset services (howto forthcoming) and fixes 

a couple of minor bugs.
0.6.0-stable
Dr Scofield 2008-09-23 15:07:20 +00:00
parent 488cb16619
commit 29950ba419
1 changed files with 109 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

112
OpenSim/ApplicationPlugins/Rest/Inventory/RestAssetServices.cs
View File

@ -170,6 +170,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
DoPut(rdata); DoPut(rdata);
break; break;
case "post" : case "post" :
DoPost(rdata);
break;
case "delete" : case "delete" :
default : default :
Rest.Log.WarnFormat("{0} Asset: Method not supported: {1}", Rest.Log.WarnFormat("{0} Asset: Method not supported: {1}",
@ -238,6 +240,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
} }
/// <summary> /// <summary>
/// UPDATE existing item, if it exists. URI identifies the item in question.
/// The only parameter we recognize is a UUID. The enclosed asset data (base-64 encoded) /// The only parameter we recognize is a UUID. The enclosed asset data (base-64 encoded)
/// is decoded and stored in the database, identified by the supplied UUID. /// is decoded and stored in the database, identified by the supplied UUID.
/// </summary> /// </summary>
@ -245,10 +248,14 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
private void DoPut(AssetRequestData rdata) private void DoPut(AssetRequestData rdata)
{ {
bool modified = false;
bool created = false;
Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method); Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method);
if (rdata.Parameters.Length == 1) if (rdata.Parameters.Length == 1)
{ {
rdata.initXmlReader(); rdata.initXmlReader();
XmlReader xml = rdata.reader; XmlReader xml = rdata.reader;
@ -258,8 +265,92 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
rdata.Fail(Rest.HttpStatusCodeBadRequest,"invalid request data"); rdata.Fail(Rest.HttpStatusCodeBadRequest,"invalid request data");
} }
AssetBase asset = new AssetBase(); UUID uuid = new UUID(rdata.Parameters[0]);
asset.ID = rdata.Parameters[0]; AssetBase asset = Rest.AssetServices.GetAsset(uuid, false);
modified = (asset != null);
created = !modified;
asset = new AssetBase();
asset.FullID = uuid;
asset.Name = xml.GetAttribute("name");
asset.Description = xml.GetAttribute("desc");
asset.Type = SByte.Parse(xml.GetAttribute("type"));
asset.Local = Int32.Parse(xml.GetAttribute("local")) != 0;
asset.Temporary = Int32.Parse(xml.GetAttribute("temporary")) != 0;
asset.Data = Convert.FromBase64String(xml.ReadElementContentAsString("Asset", ""));
if (asset.ID != rdata.Parameters[0])
{
Rest.Log.WarnFormat("{0} URI and payload disagree on UUID U:{1} vs P:{2}",
MsgId, rdata.Parameters[0], asset.ID);
}
Rest.AssetServices.AddAsset(asset);
}
else
{
Rest.Log.DebugFormat("{0} Invalid parameters: <{1}>", MsgId, rdata.path);
rdata.Fail(Rest.HttpStatusCodeNotFound, "invalid parameters");
}
if (created)
{
rdata.Complete(Rest.HttpStatusCodeCreated);
}
else
{
if (modified)
{
rdata.Complete(Rest.HttpStatusCodeOK);
}
else
{
rdata.Complete(Rest.HttpStatusCodeNoContent);
}
}
rdata.Respond(String.Format("Asset {0} : Normal completion", rdata.method));
}
/// <summary>
/// CREATE new item, replace if it exists. URI identifies the context for the item in question.
/// No parameters are required for POST, just thepayload.
/// </summary>
private void DoPost(AssetRequestData rdata)
{
bool modified = false;
bool created = false;
Rest.Log.DebugFormat("{0} REST Asset handler, Method = <{1}> ENTRY", MsgId, rdata.method);
if (rdata.Parameters.Length != 0)
{
Rest.Log.WarnFormat("{0} Parameters ignored <{1}>", MsgId, rdata.path);
Rest.Log.InfoFormat("{0} POST of an asset has no parameters", MsgId, rdata.path);
}
rdata.initXmlReader();
XmlReader xml = rdata.reader;
if (!xml.ReadToFollowing("Asset"))
{
Rest.Log.DebugFormat("{0} Invalid request data: <{1}>", MsgId, rdata.path);
rdata.Fail(Rest.HttpStatusCodeBadRequest,"invalid request data");
}
UUID uuid = new UUID(xml.GetAttribute("id"));
AssetBase asset = Rest.AssetServices.GetAsset(uuid, false);
modified = (asset != null);
created = !modified;
asset = new AssetBase();
asset.FullID = uuid;
asset.Name = xml.GetAttribute("name"); asset.Name = xml.GetAttribute("name");
asset.Description = xml.GetAttribute("desc"); asset.Description = xml.GetAttribute("desc");
asset.Type = SByte.Parse(xml.GetAttribute("type")); asset.Type = SByte.Parse(xml.GetAttribute("type"));
@ -268,15 +359,24 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
asset.Data = Convert.FromBase64String(xml.ReadElementContentAsString("Asset", "")); asset.Data = Convert.FromBase64String(xml.ReadElementContentAsString("Asset", ""));
Rest.AssetServices.AddAsset(asset); Rest.AssetServices.AddAsset(asset);
if (created)
{
rdata.Complete(Rest.HttpStatusCodeCreated);
} }
else else
{ {
Rest.Log.DebugFormat("{0} Invalid parameters: <{1}>", MsgId, rdata.path); if (modified)
rdata.Fail(Rest.HttpStatusCodeNotFound, "invalid parameters"); {
rdata.Complete(Rest.HttpStatusCodeOK);
}
else
{
rdata.Complete(Rest.HttpStatusCodeNoContent);
}
} }
rdata.Complete(); rdata.Respond(String.Format("Asset {0} : Normal completion", rdata.method));
rdata.Respond(String.Format("Asset <{0}>: Normal completion", rdata.method));
} }