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

Applied patch 485, inventory patch from tleiades (thanks again).

afrisby
MW 2007-10-08 10:30:15 +00:00
parent f2f173a00e
commit 4c25008850
11 changed files with 409 additions and 254 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
OpenSim/Framework/Communications/InventoryServiceBase.cs
View File

@ -128,7 +128,7 @@ namespace OpenSim.Framework.Communications
{
foreach (KeyValuePair<string, IInventoryData> plugin in m_plugins)
{
plugin.Value.deleteInventoryItem(item);
plugin.Value.deleteInventoryItem(item.inventoryID);
}
}

10
OpenSim/Framework/Data.MySQL/MySQLGridData.cs
View File

@ -32,6 +32,8 @@ using System.Security.Cryptography;
using System.Text;
using libsecondlife;
using OpenSim.Framework.Console;
namespace OpenSim.Framework.Data.MySQL
{
/// <summary>
@ -127,7 +129,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}
@ -159,7 +161,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}
@ -191,7 +193,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}
@ -277,7 +279,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}

408
OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
View File

@ -26,22 +26,26 @@
*
*/
using System;
using System.Collections.Generic;
using System.IO;
using System.Data;
using System.Reflection;
using System.Collections.Generic;
using libsecondlife;
using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
using MySql.Data.MySqlClient;
namespace OpenSim.Framework.Data.MySQL
{
/// <summary>
/// A MySQL interface for the inventory server
/// </summary>
class MySQLInventoryData : IInventoryData
public class MySQLInventoryData : IInventoryData
{
/// <summary>
/// The database manager
/// </summary>
public MySQLManager database;
private MySQLManager database;
/// <summary>
/// Loads and initialises this database plugin
@ -57,8 +61,101 @@ namespace OpenSim.Framework.Data.MySQL
string settingPort = GridDataMySqlFile.ParseFileReadValue("port");
database = new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling, settingPort);
TestTables(database.Connection);
}
#region Test and initialization code
/// <summary>
/// Extract a named string resource from the embedded resources
/// </summary>
/// <param name="name">name of embedded resource</param>
/// <returns>string contained within the embedded resource</returns>
private string getResourceString(string name)
{
Assembly assem = this.GetType().Assembly;
string[] names = assem.GetManifestResourceNames();
foreach(string s in names)
if(s.EndsWith(name))
using (Stream resource = assem.GetManifestResourceStream(s))
{
using (StreamReader resourceReader = new StreamReader(resource))
{
string resourceString = resourceReader.ReadToEnd();
return resourceString;
}
}
throw new Exception(string.Format("Resource '{0}' was not found", name));
}
private void ExecuteResourceSql(MySqlConnection conn, string name)
{
MySqlCommand cmd = new MySqlCommand(getResourceString(name), conn);
cmd.ExecuteNonQuery();
}
private void UpgradeFoldersTable(MySqlConnection conn, string oldVersion)
{
// null as the version, indicates that the table didn't exist
if (oldVersion == null)
{
ExecuteResourceSql(conn, "CreateFoldersTable.sql");
return;
}
// if the table is already at the current version, then we can exit immediately
if (oldVersion == "Rev. 2")
return;
ExecuteResourceSql(conn, "UpgradeFoldersTableToVersion2.sql");
}
private void UpgradeItemsTable(MySqlConnection conn, string oldVersion)
{
// null as the version, indicates that the table didn't exist
if (oldVersion == null)
{
ExecuteResourceSql(conn, "CreateItemsTable.sql");
return;
}
// if the table is already at the current version, then we can exit immediately
if (oldVersion == "Rev. 2")
return;
ExecuteResourceSql(conn, "UpgradeItemsTableToVersion2.sql");
}
private void TestTables(MySqlConnection conn)
{
Dictionary<string, string> tableList = new Dictionary<string, string>();
tableList["inventoryfolders"] = null;
tableList["inventoryitems"] = null;
MySqlCommand tablesCmd = new MySqlCommand("SELECT TABLE_NAME, TABLE_COMMENT FROM INFORMATION_SCHEMA.TABLES WHERE TABLE_SCHEMA='opensim'", conn);
MySqlDataReader tables = tablesCmd.ExecuteReader();
while (tables.Read())
{
try
{
string tableName = (string)tables["TABLE_NAME"];
string comment = (string)tables["TABLE_COMMENT"];
tableList[tableName] = comment;
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
}
}
tables.Close();
UpgradeFoldersTable(conn, tableList["inventoryfolders"]);
UpgradeItemsTable(conn, tableList["inventoryitems"]);
}
#endregion
/// <summary>
/// The name of this DB provider
/// </summary>
@ -82,7 +179,12 @@ namespace OpenSim.Framework.Data.MySQL
/// <returns>A string containing the DB provider</returns>
public string getVersion()
{
return "0.1";
System.Reflection.Module module = this.GetType().Module;
string dllName = module.Assembly.ManifestModule.Name;
Version dllVersion = module.Assembly.GetName().Version;
return string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build, dllVersion.Revision);
}
/// <summary>
@ -96,13 +198,14 @@ namespace OpenSim.Framework.Data.MySQL
{
lock (database)
{
Dictionary<string, string> param = new Dictionary<string, string>();
param["?uuid"] = folderID.ToStringHyphenated();
List<InventoryItemBase> items = new List<InventoryItemBase>();
IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", param);
IDataReader reader = result.ExecuteReader();
MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryitems WHERE parentFolderID = ?uuid", database.Connection);
result.Parameters.Add("?uuid", folderID.ToStringHyphenated());
MySqlDataReader reader = result.ExecuteReader();
List<InventoryItemBase> items = database.readInventoryItems(reader);
while(reader.Read())
items.Add(readInventoryItem(reader));
reader.Close();
result.Dispose();
@ -113,7 +216,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}
@ -129,14 +232,15 @@ namespace OpenSim.Framework.Data.MySQL
{
lock (database)
{
Dictionary<string, string> param = new Dictionary<string, string>();
param["?uuid"] = user.ToStringHyphenated();
param["?zero"] = LLUUID.Zero.ToStringHyphenated();
MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", database.Connection);
result.Parameters.Add("?uuid", user.ToStringHyphenated());
result.Parameters.Add("?zero", LLUUID.Zero.ToStringHyphenated());
MySqlDataReader reader = result.ExecuteReader();
IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
IDataReader reader = result.ExecuteReader();
List<InventoryFolderBase> items = new List<InventoryFolderBase>();
while(reader.Read())
items.Add(readInventoryFolder(reader));
List<InventoryFolderBase> items = database.readInventoryFolders(reader);
reader.Close();
result.Dispose();
@ -147,7 +251,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}
@ -167,10 +271,16 @@ namespace OpenSim.Framework.Data.MySQL
param["?uuid"] = user.ToStringHyphenated();
param["?zero"] = LLUUID.Zero.ToStringHyphenated();
IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", param);
IDataReader reader = result.ExecuteReader();
MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND agentID = ?uuid", database.Connection);
result.Parameters.Add("?uuid", user.ToStringHyphenated());
result.Parameters.Add("?zero", LLUUID.Zero.ToStringHyphenated());
MySqlDataReader reader = result.ExecuteReader();
List<InventoryFolderBase> items = new List<InventoryFolderBase>();
while(reader.Read())
items.Add(readInventoryFolder(reader));
List<InventoryFolderBase> items = database.readInventoryFolders(reader);
InventoryFolderBase rootFolder = items[0]; //should only be one folder with parent set to zero (the root one).
reader.Close();
result.Dispose();
@ -181,7 +291,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}
@ -197,13 +307,14 @@ namespace OpenSim.Framework.Data.MySQL
{
lock (database)
{
Dictionary<string, string> param = new Dictionary<string, string>();
param["?uuid"] = parentID.ToStringHyphenated();
MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", database.Connection);
result.Parameters.Add("?uuid", parentID.ToStringHyphenated());
MySqlDataReader reader = result.ExecuteReader();
IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?uuid", param);
IDataReader reader = result.ExecuteReader();
List<InventoryFolderBase> items = new List<InventoryFolderBase>();
List<InventoryFolderBase> items = database.readInventoryFolders(reader);
while(reader.Read())
items.Add(readInventoryFolder(reader));
reader.Close();
result.Dispose();
@ -214,87 +325,134 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}
/// <summary>
/// Reads a one item from an SQL result
/// </summary>
/// <param name="reader">The SQL Result</param>
/// <returns>the item read</returns>
public InventoryItemBase readInventoryItem(MySqlDataReader reader)
{
try
{
InventoryItemBase item = new InventoryItemBase();
item.inventoryID = new LLUUID((string)reader["inventoryID"]);
item.assetID = new LLUUID((string)reader["assetID"]);
item.assetType = (int)reader["assetType"];
item.parentFolderID = new LLUUID((string)reader["parentFolderID"]);
item.avatarID = new LLUUID((string)reader["avatarID"]);
item.inventoryName = (string)reader["inventoryName"];
item.inventoryDescription = (string)reader["inventoryDescription"];
item.inventoryNextPermissions = (uint)reader["inventoryNextPermissions"];
item.inventoryCurrentPermissions = (uint)reader["inventoryCurrentPermissions"];
item.invType = (int)reader["invType"];
item.creatorsID = new LLUUID((string)reader["creatorID"]);
item.inventoryBasePermissions = (uint)reader["inventoryBasePermissions"];
item.inventoryEveryOnePermissions = (uint)reader["inventoryEveryOnePermissions"];
return item;
}
catch (MySqlException e)
{
MainLog.Instance.Error(e.ToString());
}
return null;
}
/// <summary>
/// Returns a specified inventory item
/// </summary>
/// <param name="item">The item to return</param>
/// <returns>An inventory item</returns>
public InventoryItemBase getInventoryItem(LLUUID item)
public InventoryItemBase getInventoryItem(LLUUID itemID)
{
try
{
lock (database)
{
Dictionary<string, string> param = new Dictionary<string, string>();
param["?uuid"] = item.ToStringHyphenated();
IDbCommand result = database.Query("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", param);
IDataReader reader = result.ExecuteReader();
MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryitems WHERE inventoryID = ?uuid", database.Connection);
result.Parameters.Add("?uuid", itemID.ToStringHyphenated());
MySqlDataReader reader = result.ExecuteReader();
List<InventoryItemBase> items = database.readInventoryItems(reader);
InventoryItemBase item = null;
if(reader.Read())
item = readInventoryItem(reader);
reader.Close();
result.Dispose();
if (items.Count > 0)
{
return items[0];
}
else
{
return null;
}
return item;
}
}
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
}
return null;
}
/// <summary>
/// Reads a list of inventory folders returned by a query.
/// </summary>
/// <param name="reader">A MySQL Data Reader</param>
/// <returns>A List containing inventory folders</returns>
protected InventoryFolderBase readInventoryFolder(MySqlDataReader reader)
{
try
{
InventoryFolderBase folder = new InventoryFolderBase();
folder.agentID = new LLUUID((string)reader["agentID"]);
folder.parentID = new LLUUID((string)reader["parentFolderID"]);
folder.folderID = new LLUUID((string)reader["folderID"]);
folder.name = (string)reader["folderName"];
folder.type = (short)reader["type"];
folder.version = (ushort)((int)reader["version"]);
return folder;
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
}
return null;
}
/// <summary>
/// Returns a specified inventory folder
/// </summary>
/// <param name="folder">The folder to return</param>
/// <returns>A folder class</returns>
public InventoryFolderBase getInventoryFolder(LLUUID folder)
public InventoryFolderBase getInventoryFolder(LLUUID folderID)
{
try
{
lock (database)
{
Dictionary<string, string> param = new Dictionary<string, string>();
param["?uuid"] = folder.ToStringHyphenated();
IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", param);
IDataReader reader = result.ExecuteReader();
List<InventoryFolderBase> items = database.readInventoryFolders(reader);
MySqlCommand result = new MySqlCommand("SELECT * FROM inventoryfolders WHERE folderID = ?uuid", database.Connection);
result.Parameters.Add("?uuid", folderID.ToStringHyphenated());
MySqlDataReader reader = result.ExecuteReader();
reader.Read();
InventoryFolderBase folder = readInventoryFolder(reader);
reader.Close();
result.Dispose();
if (items.Count > 0)
{
return items[0];
}
else
{
return null;
}
return folder;
}
}
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}
@ -305,9 +463,31 @@ namespace OpenSim.Framework.Data.MySQL
/// <param name="item">The inventory item</param>
public void addInventoryItem(InventoryItemBase item)
{
lock (database)
string sql = "REPLACE INTO inventoryitems (inventoryID, assetID, assetType, parentFolderID, avatarID, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions, invType, creatorID, inventoryBasePermissions, inventoryEveryOnePermissions) VALUES ";
sql += "(?inventoryID, ?assetID, ?assetType, ?parentFolderID, ?avatarID, ?inventoryName, ?inventoryDescription, ?inventoryNextPermissions, ?inventoryCurrentPermissions, ?invType, ?creatorID, ?inventoryBasePermissions, ?inventoryEveryOnePermissions)";
try
{
database.insertItem(item);
MySqlCommand result = new MySqlCommand(sql, database.Connection);
result.Parameters.Add("?inventoryID", item.inventoryID.ToStringHyphenated());
result.Parameters.Add("?assetID", item.assetID.ToStringHyphenated());
result.Parameters.Add("?assetType", item.assetType.ToString());
result.Parameters.Add("?parentFolderID", item.parentFolderID.ToStringHyphenated());
result.Parameters.Add("?avatarID", item.avatarID.ToStringHyphenated());
result.Parameters.Add("?inventoryName", item.inventoryName);
result.Parameters.Add("?inventoryDescription", item.inventoryDescription);
result.Parameters.Add("?inventoryNextPermissions", item.inventoryNextPermissions.ToString());
result.Parameters.Add("?inventoryCurrentPermissions", item.inventoryCurrentPermissions.ToString());
result.Parameters.Add("?invType", item.invType);
result.Parameters.Add("?creatorID", item.creatorsID.ToStringHyphenated());
result.Parameters.Add("?inventoryBasePermissions", item.inventoryBasePermissions);
result.Parameters.Add("?inventoryEveryOnePermissions", item.inventoryEveryOnePermissions);
result.ExecuteNonQuery();
result.Dispose();
}
catch (MySqlException e)
{
MainLog.Instance.Error(e.ToString());
}
}
@ -324,9 +504,19 @@ namespace OpenSim.Framework.Data.MySQL
///
/// </summary>
/// <param name="item"></param>
public void deleteInventoryItem(InventoryItemBase item)
public void deleteInventoryItem(LLUUID itemID)
{
try
{
MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE inventoryID=?uuid", database.Connection);
cmd.Parameters.Add("?uuid", itemID.ToStringHyphenated());
cmd.ExecuteNonQuery();
}
catch (MySqlException e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
}
}
/// <summary>
@ -335,9 +525,24 @@ namespace OpenSim.Framework.Data.MySQL
/// <param name="folder">Folder to create</param>
public void addInventoryFolder(InventoryFolderBase folder)
{
lock (database)
string sql = "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName, type, version) VALUES ";
sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName, ?type, ?version)";
MySqlCommand cmd = new MySqlCommand(sql, database.Connection);
cmd.Parameters.Add("?folderID", folder.folderID.ToStringHyphenated());
cmd.Parameters.Add("?agentID", folder.agentID.ToStringHyphenated());
cmd.Parameters.Add("?parentFolderID", folder.parentID.ToStringHyphenated());
cmd.Parameters.Add("?folderName", folder.name);
cmd.Parameters.Add("?type", (short)folder.type);
cmd.Parameters.Add("?version", folder.version);
try
{
database.insertFolder(folder);
cmd.ExecuteNonQuery();
}
catch (Exception e)
{
MainLog.Instance.Error(e.ToString());
}
}
@ -351,12 +556,87 @@ namespace OpenSim.Framework.Data.MySQL
}
/// <summary>
/// Append a list of all the child folders of a parent folder
/// </summary>
/// <param name="folders">list where folders will be appended</param>
/// <param name="parentID">ID of parent</param>
protected void getInventoryFolders(ref List<InventoryFolderBase> folders, LLUUID parentID)
{
List<InventoryFolderBase> subfolderList = getInventoryFolders(parentID);
foreach (InventoryFolderBase f in subfolderList)
folders.Add(f);
}
/// <summary>
/// Returns all child folders in the hierarchy from the parent folder and down
/// </summary>
/// <param name="parentID">The folder to get subfolders for</param>
/// <returns>A list of inventory folders</returns>
protected List<InventoryFolderBase> getFolderHierarchy(LLUUID parentID)
{
List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
getInventoryFolders(ref folders, parentID);
for (int i = 0; i < folders.Count; i++)
getInventoryFolders(ref folders, folders[i].folderID);
return folders;
}
protected void deleteOneFolder(LLUUID folderID)
{
try
{
MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryfolders WHERE folderID=?uuid", database.Connection);
cmd.Parameters.Add("?uuid", folderID.ToStringHyphenated());
cmd.ExecuteNonQuery();
}
catch (MySqlException e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
}
}
protected void deleteItemsInFolder(LLUUID folderID)
{
try
{
MySqlCommand cmd = new MySqlCommand("DELETE FROM inventoryitems WHERE parentFolderID=?uuid", database.Connection);
cmd.Parameters.Add("?uuid", folderID.ToStringHyphenated());
cmd.ExecuteNonQuery();
}
catch (MySqlException e)
{
database.Reconnect();
MainLog.Instance.Error(e.ToString());
}
}
/// <summary>
/// Delete an inventory folder
/// </summary>
/// <param name="folderId">Id of folder to delete</param>
public void deleteInventoryFolder(LLUUID folderID)
{
lock (database)
{
List<InventoryFolderBase> subFolders = getFolderHierarchy(folderID);
//Delete all sub-folders
foreach (InventoryFolderBase f in subFolders)
{
deleteOneFolder(f.folderID);
deleteItemsInFolder(f.folderID);
}
//Delete the actual row
deleteOneFolder(folderID);
deleteItemsInFolder(folderID);
}
}
}
}

164
OpenSim/Framework/Data.MySQL/MySQLManager.cs
View File

@ -31,6 +31,7 @@ using System.Data;
using libsecondlife;
using MySql.Data.MySqlClient;
using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
namespace OpenSim.Framework.Data.MySQL
{
@ -42,7 +43,7 @@ namespace OpenSim.Framework.Data.MySQL
/// <summary>
/// The database connection object
/// </summary>
IDbConnection dbcon;
MySqlConnection dbcon;
/// <summary>
/// Connection string for ADO.net
/// </summary>
@ -65,7 +66,7 @@ namespace OpenSim.Framework.Data.MySQL
dbcon.Open();
Console.WriteLine("MySQL connection established");
MainLog.Instance.Verbose("MySQL connection established");
}
catch (Exception e)
{
@ -73,6 +74,14 @@ namespace OpenSim.Framework.Data.MySQL
}
}
/// <summary>
/// Get the connection being used
/// </summary>
public MySqlConnection Connection
{
get { return dbcon; }
}
/// <summary>
/// Shuts down the database connection
/// </summary>
@ -99,7 +108,7 @@ namespace OpenSim.Framework.Data.MySQL
}
catch (Exception e)
{
Console.WriteLine("Unable to reconnect to database " + e.ToString());
MainLog.Instance.Error("Unable to reconnect to database " + e.ToString());
}
}
}
@ -142,7 +151,7 @@ namespace OpenSim.Framework.Data.MySQL
}
catch (Exception e)
{
Console.WriteLine("Unable to reconnect to database " + e.ToString());
MainLog.Instance.Error("Unable to reconnect to database " + e.ToString());
}
// Run the query again
@ -160,7 +169,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
// Return null if it fails.
Console.WriteLine("Failed during Query generation: " + e.ToString());
MainLog.Instance.Error("Failed during Query generation: " + e.ToString());
return null;
}
}
@ -352,72 +361,7 @@ namespace OpenSim.Framework.Data.MySQL
return retval;
}
/// <summary>
/// Reads a list of inventory folders returned by a query.
/// </summary>
/// <param name="reader">A MySQL Data Reader</param>
/// <returns>A List containing inventory folders</returns>
public List<InventoryFolderBase> readInventoryFolders(IDataReader reader)
{
List<InventoryFolderBase> rows = new List<InventoryFolderBase>();
while(reader.Read())
{
try
{
InventoryFolderBase folder = new InventoryFolderBase();
folder.agentID = new LLUUID((string)reader["agentID"]);
folder.parentID = new LLUUID((string)reader["parentFolderID"]);
folder.folderID = new LLUUID((string)reader["folderID"]);
folder.name = (string)reader["folderName"];
rows.Add(folder);
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
}
}
return rows;
}
/// <summary>
/// Reads a collection of items from an SQL result
/// </summary>
/// <param name="reader">The SQL Result</param>
/// <returns>A List containing Inventory Items</returns>
public List<InventoryItemBase> readInventoryItems(IDataReader reader)
{
List<InventoryItemBase> rows = new List<InventoryItemBase>();
while (reader.Read())
{
try
{
InventoryItemBase item = new InventoryItemBase();
item.assetID = new LLUUID((string)reader["assetID"]);
item.avatarID = new LLUUID((string)reader["avatarID"]);
item.inventoryCurrentPermissions = Convert.ToUInt32(reader["inventoryCurrentPermissions"].ToString());
item.inventoryDescription = (string)reader["inventoryDescription"];
item.inventoryID = new LLUUID((string)reader["inventoryID"]);
item.inventoryName = (string)reader["inventoryName"];
item.inventoryNextPermissions = Convert.ToUInt32(reader["inventoryNextPermissions"].ToString());
item.parentFolderID = new LLUUID((string)reader["parentFolderID"]);
item.assetType = Convert.ToInt32(reader["type"].ToString());
rows.Add(item);
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
}
}
return rows;
}
/// <summary>
/// Inserts a new row into the log database
@ -455,87 +399,13 @@ namespace OpenSim.Framework.Data.MySQL
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return false;
}
return returnval;
}
/// <summary>
/// Inserts a new item into the database
/// </summary>
/// <param name="item">The item</param>
/// <returns>Success?</returns>
public bool insertItem(InventoryItemBase item)
{
string sql = "REPLACE INTO inventoryitems (inventoryID, assetID, type, parentFolderID, avatarID, inventoryName, inventoryDescription, inventoryNextPermissions, inventoryCurrentPermissions) VALUES ";
sql += "(?inventoryID, ?assetID, ?type, ?parentFolderID, ?avatarID, ?inventoryName, ?inventoryDescription, ?inventoryNextPermissions, ?inventoryCurrentPermissions)";
Dictionary<string, string> parameters = new Dictionary<string, string>();
parameters["?inventoryID"] = item.inventoryID.ToStringHyphenated();
parameters["?assetID"] = item.assetID.ToStringHyphenated();
parameters["?type"] = item.assetType.ToString();
parameters["?parentFolderID"] = item.parentFolderID.ToStringHyphenated();
parameters["?avatarID"] = item.avatarID.ToStringHyphenated();
parameters["?inventoryName"] = item.inventoryName;
parameters["?inventoryDescription"] = item.inventoryDescription;
parameters["?inventoryNextPermissions"] = item.inventoryNextPermissions.ToString();
parameters["?inventoryCurrentPermissions"] = item.inventoryCurrentPermissions.ToString();
bool returnval = false;
try
{
IDbCommand result = Query(sql, parameters);
if (result.ExecuteNonQuery() == 1)
returnval = true;
result.Dispose();
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
return false;
}
return returnval;
}
/// <summary>
/// Inserts a new folder into the database
/// </summary>
/// <param name="folder">The folder</param>
/// <returns>Success?</returns>
public bool insertFolder(InventoryFolderBase folder)
{
string sql = "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName) VALUES ";
sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName)";
Dictionary<string, string> parameters = new Dictionary<string, string>();
parameters["?folderID"] = folder.folderID.ToStringHyphenated();
parameters["?agentID"] = folder.agentID.ToStringHyphenated();
parameters["?parentFolderID"] = folder.parentID.ToStringHyphenated();
parameters["?folderName"] = folder.name;
bool returnval = false;
try
{
IDbCommand result = Query(sql, parameters);
if (result.ExecuteNonQuery() == 1)
returnval = true;
result.Dispose();
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
return false;
}
return returnval;
}
/// <summary>
/// Creates a new user and inserts it into the database
@ -614,7 +484,7 @@ namespace OpenSim.Framework.Data.MySQL
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return false;
}
@ -683,7 +553,7 @@ namespace OpenSim.Framework.Data.MySQL
}
catch (Exception e)
{
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return false;
}

9
OpenSim/Framework/Data.MySQL/MySQLUserData.cs
View File

@ -30,6 +30,7 @@ using System.Collections.Generic;
using System.Data;
using libsecondlife;
using OpenSim.Framework.Types;
using OpenSim.Framework.Console;
namespace OpenSim.Framework.Data.MySQL
{
@ -101,7 +102,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}
@ -134,7 +135,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}
@ -189,7 +190,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
return null;
}
}
@ -212,7 +213,7 @@ namespace OpenSim.Framework.Data.MySQL
catch (Exception e)
{
database.Reconnect();
Console.WriteLine(e.ToString());
MainLog.Instance.Error(e.ToString());
}
}

2
OpenSim/Framework/Data.SQLite/Properties/AssemblyInfo.cs
View File

@ -29,5 +29,5 @@ using System.Runtime.InteropServices;
//
// You can specify all the values or you can default the Revision and Build Numbers
// by using the '*' as shown below:
[assembly: AssemblyVersion("1.0.0.0")]
[assembly: AssemblyVersion("0.4.0.0")]
[assembly: AssemblyFileVersion("1.0.0.0")]

29
OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
View File

@ -1,6 +1,7 @@
using System;
using System.Collections.Generic;
using System.Text;
using System.Reflection;
using OpenSim.Framework.Console;
using OpenSim.Framework.Types;
@ -166,7 +167,12 @@ namespace OpenSim.Framework.Data.SQLite
/// <returns>A string containing the plugin version</returns>
public string getVersion()
{
return "0.1";
System.Reflection.Module module = this.GetType().Module;
string dllName = module.Assembly.ManifestModule.Name;
Version dllVersion = module.Assembly.GetName().Version;
return string.Format("{0}.{1}.{2}.{3}", dllVersion.Major, dllVersion.Minor, dllVersion.Build, dllVersion.Revision);
}
/// <summary>
@ -337,11 +343,11 @@ namespace OpenSim.Framework.Data.SQLite
///
/// </summary>
/// <param name="item"></param>
public void deleteInventoryItem(InventoryItemBase item)
public void deleteInventoryItem(LLUUID itemID)
{
DataTable inventoryItemTable = ds.Tables["inventoryitems"];
DataRow inventoryRow = inventoryItemTable.Rows.Find(item.inventoryID);
DataRow inventoryRow = inventoryItemTable.Rows.Find(itemID);
if (inventoryRow != null)
{
inventoryRow.Delete();
@ -350,6 +356,20 @@ namespace OpenSim.Framework.Data.SQLite
this.invItemsDa.Update(ds, "inventoryitems");
}
/// <summary>
/// Delete all items in the specified folder
/// </summary>
/// <param name="folderId">id of the folder, whose item content should be deleted</param>
//!TODO, this is horribly inefficient, but I don't want to ruin the overall structure of this implementatio
private void deleteItemsInFolder(LLUUID folderId)
{
List<InventoryItemBase> items = getInventoryInFolder(folderId);
foreach(InventoryItemBase i in items)
deleteInventoryItem(i.inventoryID);
}
/// <summary>
/// Adds a new folder specified by folder
/// </summary>
@ -389,6 +409,7 @@ namespace OpenSim.Framework.Data.SQLite
inventoryRow = inventoryFolderTable.Rows.Find(f.folderID);
if (inventoryRow != null)
{
deleteItemsInFolder(f.folderID);
inventoryRow.Delete();
}
}
@ -397,6 +418,7 @@ namespace OpenSim.Framework.Data.SQLite
inventoryRow = inventoryFolderTable.Rows.Find(folderID);
if (inventoryRow != null)
{
deleteItemsInFolder(folderID);
inventoryRow.Delete();
}
@ -554,3 +576,4 @@ namespace OpenSim.Framework.Data.SQLite
}

3
OpenSim/Framework/General/Types/InventoryItemBase.cs
View File

@ -205,7 +205,7 @@ namespace OpenSim.Framework.Types
///
/// </summary>
/// <param name="item"></param>
void deleteInventoryItem(InventoryItemBase item);
void deleteInventoryItem(LLUUID item);
/// <summary>
/// Adds a new folder specified by folder
@ -224,6 +224,5 @@ namespace OpenSim.Framework.Types
/// </summary>
/// <param name="folder">The id of the folder</param>
void deleteInventoryFolder(LLUUID folder);
}
}

3
prebuild.xml
View File

@ -696,8 +696,10 @@
<Reference name="OpenSim.Framework.Data"/>
<Reference name="libsecondlife.dll"/>
<Reference name="MySql.Data.dll"/>
<Reference name="OpenSim.Framework.Console"/>
<Files>
<Match pattern="*.cs" recurse="true"/>
<Match path="Resources" pattern="*.sql" buildAction="EmbeddedResource"/>
</Files>
</Project>
@ -1044,3 +1046,4 @@
</Prebuild>

9
share/sql/mysql-inventoryfolders.sql
View File

@ -1,9 +0,0 @@
CREATE TABLE `inventoryfolders` (
`folderID` varchar(36) NOT NULL default '',
`agentID` varchar(36) default NULL,
`parentFolderID` varchar(36) default NULL,
`folderName` varchar(64) default NULL,
PRIMARY KEY (`folderID`),
KEY `owner` (`agentID`),
KEY `parent` (`parentFolderID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;

14
share/sql/mysql-inventoryitems.sql
View File

@ -1,14 +0,0 @@
CREATE TABLE `inventoryitems` (
`inventoryID` varchar(36) NOT NULL default '',
`assetID` varchar(36) default NULL,
`type` int(11) default NULL,
`parentFolderID` varchar(36) default NULL,
`avatarID` varchar(36) default NULL,
`inventoryName` varchar(64) default NULL,
`inventoryDescription` varchar(64) default NULL,
`inventoryNextPermissions` int(10) unsigned default NULL,
`inventoryCurrentPermissions` int(10) unsigned default NULL,
PRIMARY KEY (`inventoryID`),
KEY `owner` (`avatarID`),
KEY `folder` (`parentFolderID`)
) ENGINE=InnoDB DEFAULT CHARSET=utf8;