From 5fc9fe70af3c076492a537c8456a14b9f8cfa485 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Tue, 6 Apr 2010 19:38:01 -0700
Subject: Added NullInventoryData for unit tests and quick try-outs of the
services in 64-bit machines (no SQLite).
---
OpenSim/Data/Null/NullInventoryData.cs | 193 +++++++++++++++++++++++++++++++++
1 file changed, 193 insertions(+)
create mode 100644 OpenSim/Data/Null/NullInventoryData.cs
(limited to 'OpenSim/Data/Null')
diff --git a/OpenSim/Data/Null/NullInventoryData.cs b/OpenSim/Data/Null/NullInventoryData.cs
new file mode 100644
index 0000000..8f196e2
--- /dev/null
+++ b/OpenSim/Data/Null/NullInventoryData.cs
@@ -0,0 +1,193 @@
+using System;
+using System.Collections.Generic;
+
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Data.Null
+{
+ ///
+ /// This class is completely null.
+ ///
+ public class NullInventoryData : IInventoryDataPlugin
+ {
+ public string Version { get { return "1.0.0.0"; } }
+
+ public void Initialise()
+ {
+ }
+
+ public void Dispose()
+ {
+ // Do nothing.
+ }
+
+ public string Name
+ {
+ get { return "Null Inventory Data Interface"; }
+ }
+
+ public void Initialise(string connect)
+ {
+ }
+
+
+ ///
+ /// Returns all descendent folders of this folder. Does not return the parent folder itself.
+ ///
+ /// The folder to get subfolders for
+ /// A list of inventory folders
+ public List getFolderHierarchy(UUID parentID)
+ {
+ return new List();
+ }
+
+ ///
+ /// Returns a list of inventory items contained within the specified folder
+ ///
+ /// The UUID of the target folder
+ /// A List of InventoryItemBase items
+ public List getInventoryInFolder(UUID folderID)
+ {
+ return new List();
+ }
+
+ ///
+ /// Returns a list of the root folders within a users inventory
+ ///
+ /// The user whos inventory is to be searched
+ /// A list of folder objects
+ public List getUserRootFolders(UUID user)
+ {
+ return new List();
+ }
+
+ ///
+ /// Returns the users inventory root folder.
+ ///
+ /// The UUID of the user who is having inventory being returned
+ /// Root inventory folder, null if no root inventory folder was found
+ public InventoryFolderBase getUserRootFolder(UUID user)
+ {
+ return null;
+ }
+
+ ///
+ /// Returns a list of inventory folders contained in the folder 'parentID'
+ ///
+ /// The folder to get subfolders for
+ /// A list of inventory folders
+ public List getInventoryFolders(UUID parentID)
+ {
+ return new List();
+ }
+
+ ///
+ /// Returns an inventory item by its UUID
+ ///
+ /// The UUID of the item to be returned
+ /// A class containing item information
+ public InventoryItemBase getInventoryItem(UUID item)
+ {
+ return null;
+ }
+
+ ///
+ /// Returns a specified inventory folder by its UUID
+ ///
+ /// The UUID of the folder to be returned
+ /// A class containing folder information
+ public InventoryFolderBase getInventoryFolder(UUID folder)
+ {
+ return null;
+ }
+
+ ///
+ /// Creates a new inventory item based on item
+ ///
+ /// The item to be created
+ public void addInventoryItem(InventoryItemBase item)
+ {
+ }
+
+ ///
+ /// Updates an inventory item with item (updates based on ID)
+ ///
+ /// The updated item
+ public void updateInventoryItem(InventoryItemBase item)
+ {
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public void deleteInventoryItem(UUID item)
+ {
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public InventoryItemBase queryInventoryItem(UUID item)
+ {
+ return null;
+ }
+
+ ///
+ ///
+ ///
+ ///
+ public InventoryFolderBase queryInventoryFolder(UUID folder)
+ {
+ return null;
+ }
+
+ ///
+ /// Adds a new folder specified by folder
+ ///
+ /// The inventory folder
+ public void addInventoryFolder(InventoryFolderBase folder)
+ {
+ }
+
+ ///
+ /// Updates a folder based on its ID with folder
+ ///
+ /// The inventory folder
+ public void updateInventoryFolder(InventoryFolderBase folder)
+ {
+ }
+
+ ///
+ /// Updates a folder based on its ID with folder
+ ///
+ /// The inventory folder
+ public void moveInventoryFolder(InventoryFolderBase folder)
+ {
+ }
+
+ ///
+ /// Deletes a folder. Thie will delete both the folder itself and its contents (items and descendent folders)
+ ///
+ /// The id of the folder
+ public void deleteInventoryFolder(UUID folder)
+ {
+ }
+
+ ///
+ /// Returns all activated gesture-items in the inventory of the specified avatar.
+ ///
+ ///
+ /// The of the avatar
+ ///
+ ///
+ /// The list of gestures (s)
+ ///
+ public List fetchActiveGestures(UUID avatarID)
+ {
+ return new List();
+ }
+ }
+}
--
cgit v1.1
From 930d3745256ced37afb2d91817eba941d06a50b0 Mon Sep 17 00:00:00 2001
From: Diva Canto
Date: Fri, 16 Apr 2010 16:36:44 -0700
Subject: Expose Delete at IUserAccountData interface. It was there already. No
changes in IUserAccountService, just the data layer.
---
OpenSim/Data/Null/NullUserAccountData.cs | 21 +++++++++++++++++++++
1 file changed, 21 insertions(+)
(limited to 'OpenSim/Data/Null')
diff --git a/OpenSim/Data/Null/NullUserAccountData.cs b/OpenSim/Data/Null/NullUserAccountData.cs
index fc2c5d5..9eb94e6 100644
--- a/OpenSim/Data/Null/NullUserAccountData.cs
+++ b/OpenSim/Data/Null/NullUserAccountData.cs
@@ -135,5 +135,26 @@ namespace OpenSim.Data.Null
return result;
}
+ public bool Delete(string field, string val)
+ {
+ // Only delete by PrincipalID
+ if (field.Equals("PrincipalID"))
+ {
+ UUID uuid = UUID.Zero;
+ if (UUID.TryParse(val, out uuid) && m_DataByUUID.ContainsKey(uuid))
+ {
+ UserAccountData account = m_DataByUUID[uuid];
+ m_DataByUUID.Remove(uuid);
+ if (m_DataByName.ContainsKey(account.FirstName + " " + account.LastName))
+ m_DataByName.Remove(account.FirstName + " " + account.LastName);
+ if (account.Data.ContainsKey("Email") && account.Data["Email"] != string.Empty && m_DataByEmail.ContainsKey(account.Data["Email"]))
+ m_DataByEmail.Remove(account.Data["Email"]);
+
+ return true;
+ }
+ }
+
+ return false;
+ }
}
}
--
cgit v1.1