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

From: Alan Webb (alan_webb@us.ibm.com) 

Cleanups in REST inventory and asset services.
0.6.0-stable
Dr Scofield 2008-10-30 15:26:23 +00:00
parent e8615f0fee
commit 3a6037b421
2 changed files with 18 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -254,6 +254,8 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
bool modified = false; bool modified = false;
bool created = false; bool created = false;
AssetBase asset = null;
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)
@ -269,7 +271,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
} }
UUID uuid = new UUID(rdata.Parameters[0]); UUID uuid = new UUID(rdata.Parameters[0]);
AssetBase asset = Rest.AssetServices.GetAsset(uuid, false); asset = Rest.AssetServices.GetAsset(uuid, false);
modified = (asset != null); modified = (asset != null);
created = !modified; created = !modified;
@ -300,12 +302,14 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (created) if (created)
{ {
rdata.appendStatus(String.Format("<p> Created asset {0}, UUID {1} <p>", asset.Name, asset.FullID));
rdata.Complete(Rest.HttpStatusCodeCreated); rdata.Complete(Rest.HttpStatusCodeCreated);
} }
else else
{ {
if (modified) if (modified)
{ {
rdata.appendStatus(String.Format("<p> Modified asset {0}, UUID {1} <p>", asset.Name, asset.FullID));
rdata.Complete(Rest.HttpStatusCodeOK); rdata.Complete(Rest.HttpStatusCodeOK);
} }
else else
@ -365,12 +369,14 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
if (created) if (created)
{ {
rdata.appendStatus(String.Format("<p> Created asset {0}, UUID {1} <p>", asset.Name, asset.FullID));
rdata.Complete(Rest.HttpStatusCodeCreated); rdata.Complete(Rest.HttpStatusCodeCreated);
} }
else else
{ {
if (modified) if (modified)
{ {
rdata.appendStatus(String.Format("<p> Modified asset {0}, UUID {1} <p>", asset.Name, asset.FullID));
rdata.Complete(Rest.HttpStatusCodeOK); rdata.Complete(Rest.HttpStatusCodeOK);
} }
else else

22
OpenSim/ApplicationPlugins/Rest/Inventory/RestInventoryServices.cs
View File

@ -498,7 +498,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.AssetServices.AddAsset(asset); Rest.AssetServices.AddAsset(asset);
created = true; created = true;
rdata.appendStatus(String.Format("<p> Created asset {0}, UUID {1}<p>", rdata.appendStatus(String.Format("<p> Created asset {0}, UUID {1} <p>",
asset.Name, asset.ID)); asset.Name, asset.ID));
if (Rest.DEBUG && Rest.DumpAsset) if (Rest.DEBUG && Rest.DumpAsset)
@ -556,7 +556,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.InventoryServices.MoveFolder(folder); Rest.InventoryServices.MoveFolder(folder);
modified = true; modified = true;
rdata.appendStatus(String.Format("<p> Created folder {0}, UUID {1}<p>", rdata.appendStatus(String.Format("<p> Created folder {0}, UUID {1} <p>",
folder.Name, folder.ID)); folder.Name, folder.ID));
} }
else else
@ -565,7 +565,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.InventoryServices.AddFolder(folder); Rest.InventoryServices.AddFolder(folder);
created = true; created = true;
rdata.appendStatus(String.Format("<p> Modified folder {0}, UUID {1}<p>", rdata.appendStatus(String.Format("<p> Modified folder {0}, UUID {1} <p>",
folder.Name, folder.ID)); folder.Name, folder.ID));
} }
} }
@ -604,7 +604,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
MsgId, item.ID, item.AssetID, item.InvType, item.AssetType, item.Name); MsgId, item.ID, item.AssetID, item.InvType, item.AssetType, item.Name);
Rest.InventoryServices.UpdateItem(item); Rest.InventoryServices.UpdateItem(item);
modified = true; modified = true;
rdata.appendStatus(String.Format("<p> Modified item {0}, UUID {1}<p>", item.Name, item.ID)); rdata.appendStatus(String.Format("<p> Modified item {0}, UUID {1} <p>", item.Name, item.ID));
} }
else else
{ {
@ -612,7 +612,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
MsgId, item.ID, item.AssetID, item.InvType, item.AssetType, item.Name); MsgId, item.ID, item.AssetID, item.InvType, item.AssetType, item.Name);
Rest.InventoryServices.AddItem(item); Rest.InventoryServices.AddItem(item);
created = true; created = true;
rdata.appendStatus(String.Format("<p> Created item {2}, UUID {3}<p>", item.Name, item.ID)); rdata.appendStatus(String.Format("<p> Created item {0}, UUID {1} <p>", item.Name, item.ID));
} }
} }
@ -705,7 +705,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.AssetServices.AddAsset(asset); Rest.AssetServices.AddAsset(asset);
created = true; created = true;
rdata.appendStatus(String.Format("<p> Created asset {0}, UUID {1}<p>", asset.Name, asset.ID)); rdata.appendStatus(String.Format("<p> Created asset {0}, UUID {1} <p>", asset.Name, asset.ID));
if (Rest.DEBUG && Rest.DumpAsset) if (Rest.DEBUG && Rest.DumpAsset)
{ {
@ -824,13 +824,13 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
foreach (InventoryFolderBase f in entity.Folders) foreach (InventoryFolderBase f in entity.Folders)
{ {
rdata.appendStatus(String.Format("<p>Moving folder {0} UUID {1}<p>", f.Name, f.ID)); rdata.appendStatus(String.Format("<p>Moving folder {0} UUID {1} <p>", f.Name, f.ID));
Rest.InventoryServices.MoveFolder(f); Rest.InventoryServices.MoveFolder(f);
} }
foreach (InventoryItemBase it in entity.Items) foreach (InventoryItemBase it in entity.Items)
{ {
rdata.appendStatus(String.Format("<p>Storing item {0} UUID {1}<p>", it.Name, it.ID)); rdata.appendStatus(String.Format("<p>Storing item {0} UUID {1} <p>", it.Name, it.ID));
Rest.InventoryServices.AddItem(it); Rest.InventoryServices.AddItem(it);
} }
} }
@ -881,7 +881,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.InventoryServices.AddItem(xml); Rest.InventoryServices.AddItem(xml);
rdata.appendStatus(String.Format("<p>Storing item {0} UUID {1}<p>", xml.Name, xml.ID)); rdata.appendStatus(String.Format("<p>Storing item {0} UUID {1} <p>", xml.Name, xml.ID));
} }
if (created) if (created)
@ -941,7 +941,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.InventoryServices.MoveFolder(folder); Rest.InventoryServices.MoveFolder(folder);
Rest.InventoryServices.PurgeFolder(TrashCan); Rest.InventoryServices.PurgeFolder(TrashCan);
rdata.appendStatus(String.Format("<p>Deleted folder {0} UUID {1}<p>", folder.Name, folder.ID)); rdata.appendStatus(String.Format("<p>Deleted folder {0} UUID {1} <p>", folder.Name, folder.ID));
} }
// Deleting items is much more straight forward. // Deleting items is much more straight forward.
@ -952,7 +952,7 @@ namespace OpenSim.ApplicationPlugins.Rest.Inventory
Rest.Log.DebugFormat("{0} {1}: Item {2} will be deleted", Rest.Log.DebugFormat("{0} {1}: Item {2} will be deleted",
MsgId, rdata.method, rdata.path); MsgId, rdata.method, rdata.path);
Rest.InventoryServices.DeleteItem(item); Rest.InventoryServices.DeleteItem(item);
rdata.appendStatus(String.Format("<p>Deleted item {0} UUID {1}<p>", item.Name, item.ID)); rdata.appendStatus(String.Format("<p>Deleted item {0} UUID {1} <p>", item.Name, item.ID));
} }
rdata.Complete(); rdata.Complete();