Merge branch 'master' of ssh://MyConnection/var/git/opensim

6 files changed, 91 insertions, 10 deletions

diff --git a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
index 45e921a..1004fb9 100644
--- a/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/HGInventoryServiceConnector.cs
@@ -201,6 +201,19 @@ namespace OpenSim.Services.Connectors.Inventory
             return false;
         }
 
+        public bool DeleteFolders(string id, List<UUID> folders, UUID sessionID)
+        {
+            string url = string.Empty;
+            string userID = string.Empty;
+
+            if (StringToUrlAndUserID(id, out url, out userID))
+            {
+                ISessionAuthInventoryService connector = GetConnector(url);
+                return connector.DeleteFolders(userID, folders, sessionID);
+            }
+            return false;
+        }
+
         public bool PurgeFolder(string id, InventoryFolderBase folder, UUID sessionID)
         {
             string url = string.Empty;
diff --git a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
index c89c9b7..da8c7e2 100644
--- a/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
+++ b/OpenSim/Services/Connectors/Inventory/ISessionAuthInventoryService.cs
@@ -89,6 +89,11 @@ namespace OpenSim.Services.Connectors
         bool MoveFolder(string userID, InventoryFolderBase folder, UUID session_id);
 
         /// <summary>
+        /// Delete a list of inventory folders (from trash)
+        /// </summary>
+        bool DeleteFolders(string userID, List<UUID> folders, UUID session_id);
+
+        /// <summary>
         /// Purge an inventory folder of all its items and subfolders.
         /// </summary>
         /// <param name="folder"></param>
diff --git a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
index b573a06..a2261ba 100644
--- a/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/InventoryServiceConnector.cs
@@ -229,6 +229,11 @@ namespace OpenSim.Services.Connectors
                 return SynchronousRestSessionObjectPoster<Guid, InventoryCollection>.BeginPostObject(
                     "POST", m_ServerURI + "/GetFolderContent/", folderID.Guid, sessionID.ToString(), userID.ToString());
             }
+            catch (TimeoutException e)
+            {
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: GetFolderContent operation to {0} timed out {0} {1}.", m_ServerURI,
+                     e.Source, e.Message);
+            }
             catch (Exception e)
             {
                 // Maybe we're talking to an old inventory server. Try this other thing.
@@ -308,6 +313,25 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
+        public bool DeleteFolders(string userID, List<UUID> folderIDs, UUID sessionID)
+        {
+            try
+            {
+                List<Guid> guids = new List<Guid>();
+                foreach (UUID u in folderIDs)
+                    guids.Add(u.Guid);
+                return SynchronousRestSessionObjectPoster<List<Guid>, bool>.BeginPostObject(
+                    "POST", m_ServerURI + "/DeleteFolders/", guids, sessionID.ToString(), userID);
+            }
+            catch (Exception e)
+            {
+                m_log.ErrorFormat("[INVENTORY CONNECTOR]: Delete inventory folders operation failed, {0} {1}",
+                     e.Source, e.Message);
+            }
+
+            return false;
+        }
+
         public bool MoveFolder(string userID, InventoryFolderBase folder, UUID sessionID)
         {
             try
@@ -397,13 +421,28 @@ namespace OpenSim.Services.Connectors
 
         private void MoveItemsAsync(string userID, List<InventoryItemBase> items, UUID sessionID)
         {
+            if (items == null)
+            {
+                m_log.WarnFormat("[INVENTORY CONNECTOR]: request to move items got a null list.");
+                return;
+            }
+
             try
             {
-                SynchronousRestSessionObjectPoster<List<InventoryItemBase>, bool>.BeginPostObject(
-                    "POST", m_ServerURI + "/MoveItems/", items, sessionID.ToString(), userID.ToString());
+                //SynchronousRestSessionObjectPoster<List<InventoryItemBase>, bool>.BeginPostObject(
+                //    "POST", m_ServerURI + "/MoveItems/", items, sessionID.ToString(), userID.ToString());
+
+                //// Success
+                //return;
+                string uri = m_ServerURI + "/inventory/" + userID;
+                if (SynchronousRestObjectRequester.
+                        MakeRequest<List<InventoryItemBase>, bool>("PUT", uri, items))
+                    m_log.DebugFormat("[INVENTORY CONNECTOR]: move {0} items poster succeeded {1}", items.Count, uri);
+                else
+                    m_log.DebugFormat("[INVENTORY CONNECTOR]: move {0} items poster failed {1}", items.Count, uri); ;
 
-                // Success
                 return;
+
             }
             catch (Exception e)
             {
@@ -466,12 +505,12 @@ namespace OpenSim.Services.Connectors
             return null;
         }
 
-        public InventoryFolderBase QueryFolder(string userID, InventoryFolderBase item, UUID sessionID)
+        public InventoryFolderBase QueryFolder(string userID, InventoryFolderBase folder, UUID sessionID)
         {
             try
             {
                 return SynchronousRestSessionObjectPoster<InventoryFolderBase, InventoryFolderBase>.BeginPostObject(
-                    "POST", m_ServerURI + "/QueryFolder/", item, sessionID.ToString(), item.Owner.ToString());
+                    "POST", m_ServerURI + "/QueryFolder/", folder, sessionID.ToString(), userID);
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
index cd283ff..a7aa138 100644
--- a/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
+++ b/OpenSim/Services/Connectors/Inventory/QuickAndDirtyInventoryServiceConnector.cs
@@ -136,6 +136,12 @@ namespace OpenSim.Services.Connectors
             return false;
         }
 
+        public bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
+        {
+            return false;
+        }
+
+
         public bool PurgeFolder(InventoryFolderBase folder)
         {
             return false;
diff --git a/OpenSim/Services/Interfaces/IInventoryService.cs b/OpenSim/Services/Interfaces/IInventoryService.cs
index ebdb09a..c775090 100644
--- a/OpenSim/Services/Interfaces/IInventoryService.cs
+++ b/OpenSim/Services/Interfaces/IInventoryService.cs
@@ -122,6 +122,14 @@ namespace OpenSim.Services.Interfaces
         bool MoveFolder(InventoryFolderBase folder);
 
         /// <summary>
+        /// Delete an item from the user's inventory
+        /// </summary>
+        /// <param name="item"></param>
+        /// <returns>true if the item was successfully deleted</returns>
+        //bool DeleteItem(InventoryItemBase item);
+        bool DeleteFolders(UUID userID, List<UUID> folderIDs);
+
+        /// <summary>
         /// Purge an inventory folder of all its items and subfolders.
         /// </summary>
         /// <param name="folder"></param>
diff --git a/OpenSim/Services/InventoryService/InventoryService.cs b/OpenSim/Services/InventoryService/InventoryService.cs
index 6310254..19b1fd8 100644
--- a/OpenSim/Services/InventoryService/InventoryService.cs
+++ b/OpenSim/Services/InventoryService/InventoryService.cs
@@ -235,8 +235,6 @@ namespace OpenSim.Services.InventoryService
 
         public InventoryCollection GetFolderContent(UUID userID, UUID folderID)
         {
-            m_log.Info("[INVENTORY SERVICE]: Processing request for folder " + folderID);
-
             // Uncomment me to simulate a slow responding inventory server
             //Thread.Sleep(16000);
 
@@ -249,7 +247,7 @@ namespace OpenSim.Services.InventoryService
             invCollection.Folders = folders;
             invCollection.Items = items;
 
-            m_log.DebugFormat("[INVENTORY SERVICE]: Found {0} items and {1} folders", items.Count, folders.Count);
+            m_log.DebugFormat("[INVENTORY SERVICE]: Found {0} items and {1} folders in folder {2}", items.Count, folders.Count, folderID);
 
             return invCollection;            
         }
@@ -427,15 +425,27 @@ namespace OpenSim.Services.InventoryService
             return null;
         }
 
-        public virtual InventoryFolderBase GetFolder(InventoryFolderBase item)
+        public virtual InventoryFolderBase GetFolder(InventoryFolderBase folder)
         {
-            InventoryFolderBase result = m_Database.getInventoryFolder(item.ID);
+            InventoryFolderBase result = m_Database.getInventoryFolder(folder.ID);
             if (result != null)
                 return result;
 
+            m_log.DebugFormat("[INVENTORY SERVICE]: GetFolder failed to find folder {0}", folder.ID);
             return null;
         }
 
+        public virtual bool DeleteFolders(UUID ownerID, List<UUID> folderIDs)
+        {
+            foreach (UUID id in folderIDs)
+            {
+                InventoryFolderBase folder = new InventoryFolderBase(id, ownerID);
+                PurgeFolder(folder);
+                m_Database.deleteInventoryFolder(id);
+            }
+            return true;
+        }
+
         /// <summary>
         /// Purge a folder of all items items and subfolders.
         ///