From e76333555d2016412b17f43039962d32ad8c0609 Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 4 Jan 2010 18:47:47 +0000
Subject: First stage port of the XInventoryService
---
OpenSim/Data/MySQL/MySQLXInventoryData.cs | 113 ++++++++++++++++++++++++++++++
1 file changed, 113 insertions(+)
create mode 100644 OpenSim/Data/MySQL/MySQLXInventoryData.cs
(limited to 'OpenSim/Data/MySQL/MySQLXInventoryData.cs')
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
new file mode 100644
index 0000000..dd3e6ea
--- /dev/null
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -0,0 +1,113 @@
+/*
+ * Copyright (c) Contributors, http://opensimulator.org/
+ * See CONTRIBUTORS.TXT for a full list of copyright holders.
+ *
+ * Redistribution and use in source and binary forms, with or without
+ * modification, are permitted provided that the following conditions are met:
+ * * Redistributions of source code must retain the above copyright
+ * notice, this list of conditions and the following disclaimer.
+ * * Redistributions in binary form must reproduce the above copyright
+ * notice, this list of conditions and the following disclaimer in the
+ * documentation and/or other materials provided with the distribution.
+ * * Neither the name of the OpenSimulator Project nor the
+ * names of its contributors may be used to endorse or promote products
+ * derived from this software without specific prior written permission.
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE DEVELOPERS ``AS IS'' AND ANY
+ * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ * WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ * DISCLAIMED. IN NO EVENT SHALL THE CONTRIBUTORS BE LIABLE FOR ANY
+ * DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ * (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
+ * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+ * (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS
+ * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+ */
+
+using System;
+using System.Data;
+using System.Reflection;
+using System.Collections.Generic;
+using log4net;
+using MySql.Data.MySqlClient;
+using OpenMetaverse;
+using OpenSim.Framework;
+
+namespace OpenSim.Data.MySQL
+{
+ ///
+ /// A MySQL Interface for the Asset Server
+ ///
+ public class MySQLXInventoryData : IXInventoryData
+ {
+ private static readonly ILog m_log = LogManager.GetLogger(
+ MethodBase.GetCurrentMethod().DeclaringType);
+
+ private MySQLGenericTableHandler m_Folders;
+ private MySqlItemHandler m_Items;
+
+ public MySQLXInventoryData(string conn, string realm)
+ {
+ m_Folders = new MySQLGenericTableHandler(
+ conn, "inventoryfolders", "InventoryStore");
+ m_Items = new MySqlItemHandler(
+ conn, "inventoryitems", String.Empty);
+ }
+
+ public XInventoryFolder[] GetFolders(string[] fields, string[] vals)
+ {
+ return m_Folders.Get(fields, vals);
+ }
+
+ public XInventoryItem[] GetItems(string[] fields, string[] vals)
+ {
+ return m_Items.Get(fields, vals);
+ }
+
+ public bool StoreFolder(XInventoryFolder folder)
+ {
+ return m_Folders.Store(folder);
+ }
+
+ public bool StoreItem(XInventoryItem item)
+ {
+ return m_Items.Store(item);
+ }
+
+ public bool DeleteFolders(string field, string val)
+ {
+ return m_Folders.Delete(field, val);
+ }
+
+ public bool DeleteItems(string field, string val)
+ {
+ return m_Items.Delete(field, val);
+ }
+
+ public bool MoveItem(string principalID, string id, string newParent)
+ {
+ return m_Items.MoveItem(principalID, id, newParent);
+ }
+ }
+
+ public class MySqlItemHandler : MySQLGenericTableHandler
+ {
+ public MySqlItemHandler(string c, string t, string m) :
+ base(c, t, m)
+ {
+ }
+
+ public bool MoveItem(string principalID, string id, string newParent)
+ {
+ MySqlCommand cmd = new MySqlCommand();
+
+ cmd.CommandText = String.Format("update {0} set parentFolderID = ?ParentFolderID where agentID = ?AgentID and folderID = ?FolderID");
+ cmd.Parameters.AddWithValue("?ParentFolderID", newParent);
+ cmd.Parameters.AddWithValue("?FolderID", id);
+ cmd.Parameters.AddWithValue("?AgentID", principalID);
+
+ return ExecuteNonQuery(cmd) == 0 ? false : true;
+ }
+ }
+}
--
cgit v1.1
From 1ae9bfc0746b97f57031f282d4f6721b08c27f0c Mon Sep 17 00:00:00 2001
From: Melanie
Date: Mon, 4 Jan 2010 20:52:44 +0000
Subject: Finish conversion if XInventoryService
---
OpenSim/Data/MySQL/MySQLXInventoryData.cs | 55 +++++++++++++++++++++++++++----
1 file changed, 49 insertions(+), 6 deletions(-)
(limited to 'OpenSim/Data/MySQL/MySQLXInventoryData.cs')
diff --git a/OpenSim/Data/MySQL/MySQLXInventoryData.cs b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
index dd3e6ea..0eebc9c 100644
--- a/OpenSim/Data/MySQL/MySQLXInventoryData.cs
+++ b/OpenSim/Data/MySQL/MySQLXInventoryData.cs
@@ -85,9 +85,19 @@ namespace OpenSim.Data.MySQL
return m_Items.Delete(field, val);
}
- public bool MoveItem(string principalID, string id, string newParent)
+ public bool MoveItem(string id, string newParent)
{
- return m_Items.MoveItem(principalID, id, newParent);
+ return m_Items.MoveItem(id, newParent);
+ }
+
+ public XInventoryItem[] GetActiveGestures(UUID principalID)
+ {
+ return m_Items.GetActiveGestures(principalID);
+ }
+
+ public int GetAssetPermissions(UUID principalID, UUID assetID)
+ {
+ return m_Items.GetAssetPermissions(principalID, assetID);
}
}
@@ -98,16 +108,49 @@ namespace OpenSim.Data.MySQL
{
}
- public bool MoveItem(string principalID, string id, string newParent)
+ public bool MoveItem(string id, string newParent)
{
MySqlCommand cmd = new MySqlCommand();
- cmd.CommandText = String.Format("update {0} set parentFolderID = ?ParentFolderID where agentID = ?AgentID and folderID = ?FolderID");
+ cmd.CommandText = String.Format("update {0} set parentFolderID = ?ParentFolderID where inventoryID = ?InventoryID", m_Realm);
cmd.Parameters.AddWithValue("?ParentFolderID", newParent);
- cmd.Parameters.AddWithValue("?FolderID", id);
- cmd.Parameters.AddWithValue("?AgentID", principalID);
+ cmd.Parameters.AddWithValue("?InventoryID", id);
return ExecuteNonQuery(cmd) == 0 ? false : true;
}
+
+ public XInventoryItem[] GetActiveGestures(UUID principalID)
+ {
+ MySqlCommand cmd = new MySqlCommand();
+ cmd.CommandText = String.Format("select * from inventoryitems where avatarId = ?uuid and assetType = ?type and flags = 1", m_Realm);
+
+ cmd.Parameters.AddWithValue("?uuid", principalID.ToString());
+ cmd.Parameters.AddWithValue("?type", (int)AssetType.Gesture);
+
+ return DoQuery(cmd);
+ }
+
+ public int GetAssetPermissions(UUID principalID, UUID assetID)
+ {
+ MySqlCommand cmd = new MySqlCommand();
+
+ cmd.CommandText = String.Format("select bit_or(inventoryCurrentPermissions) as inventoryCurrentPermissions from inventoryitems where avatarID = ?PrincipalID and assetID = ?AssetID group by assetID", m_Realm);
+ cmd.Parameters.AddWithValue("?PrincipalID", principalID.ToString());
+ cmd.Parameters.AddWithValue("?AssetID", assetID.ToString());
+
+ IDataReader reader = ExecuteReader(cmd);
+
+ int perms = 0;
+
+ if (reader.Read())
+ {
+ perms = Convert.ToInt32(reader["inventoryCurrentPermissions"]);
+ }
+
+ reader.Close();
+ CloseReaderCommand(cmd);
+
+ return perms;
+ }
}
}
--
cgit v1.1