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

in theory, this moves the appearance mapper to live 

under the MySQLUserData.  There is a lot of in theory here
so testing would be appreciated.
0.6.0-stable
Sean Dague 2008-05-16 14:30:25 +00:00
parent e6d4c8f0c9
commit 0076ed40ff
2 changed files with 71 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

99
OpenSim/Data/MySQL/MySQLUserData.cs
View File

@ -33,6 +33,9 @@ using System.Text.RegularExpressions;
using libsecondlife; using libsecondlife;
using log4net; using log4net;
using OpenSim.Framework; using OpenSim.Framework;
using OpenSim.Data.Base;
using OpenSim.Data.MapperFactory;
using OpenSim.Data.MySQLMapper;
namespace OpenSim.Data.MySQL namespace OpenSim.Data.MySQL
{ {
@ -51,44 +54,65 @@ namespace OpenSim.Data.MySQL
private string m_agentsTableName; private string m_agentsTableName;
private string m_usersTableName; private string m_usersTableName;
private string m_userFriendsTableName; private string m_userFriendsTableName;
private string m_connectString;
private BaseDatabaseConnector m_databaseMapper;
private AppearanceTableMapper m_appearanceMapper;
/// <summary> /// <summary>
/// Loads and initialises the MySQL storage plugin /// Loads and initialises the MySQL storage plugin
/// </summary> /// </summary>
override public void Initialise(string connect) override public void Initialise(string connect)
{ {
// TODO: actually do something with our connect string if (connect == String.Empty) {
// instead of loading the second config // TODO: actually do something with our connect string
// instead of loading the second config
IniFile iniFile = new IniFile("mysql_connection.ini"); m_log.Warn("Using obsoletely mysql_connection.ini, try using user_source connect string instead");
string settingHostname = iniFile.ParseFileReadValue("hostname"); IniFile iniFile = new IniFile("mysql_connection.ini");
string settingDatabase = iniFile.ParseFileReadValue("database"); string settingHostname = iniFile.ParseFileReadValue("hostname");
string settingUsername = iniFile.ParseFileReadValue("username"); string settingDatabase = iniFile.ParseFileReadValue("database");
string settingPassword = iniFile.ParseFileReadValue("password"); string settingUsername = iniFile.ParseFileReadValue("username");
string settingPooling = iniFile.ParseFileReadValue("pooling"); string settingPassword = iniFile.ParseFileReadValue("password");
string settingPort = iniFile.ParseFileReadValue("port"); string settingPooling = iniFile.ParseFileReadValue("pooling");
string settingPort = iniFile.ParseFileReadValue("port");
m_usersTableName = iniFile.ParseFileReadValue("userstablename"); m_usersTableName = iniFile.ParseFileReadValue("userstablename");
if (m_usersTableName == null) if (m_usersTableName == null)
{ {
m_usersTableName = "users";
}
m_userFriendsTableName = iniFile.ParseFileReadValue("userfriendstablename");
if (m_userFriendsTableName == null)
{
m_userFriendsTableName = "userfriends";
}
m_agentsTableName = iniFile.ParseFileReadValue("agentstablename");
if (m_agentsTableName == null)
{
m_agentsTableName = "agents";
}
m_connectString = "Server=" + settingHostname + ";Port=" + settingPort + ";Database=" + settingDatabase + ";User ID=" +
settingUsername + ";Password=" + settingPassword + ";Pooling=" + settingPooling + ";";
database = new MySQLManager(m_connectString);
} else {
m_connectString = connect;
m_agentsTableName = "agents";
m_usersTableName = "users"; m_usersTableName = "users";
}
m_userFriendsTableName = iniFile.ParseFileReadValue("userfriendstablename");
if (m_userFriendsTableName == null)
{
m_userFriendsTableName = "userfriends"; m_userFriendsTableName = "userfriends";
} }
m_agentsTableName = iniFile.ParseFileReadValue("agentstablename"); string mapperTypeStr = "MySQL";
if (m_agentsTableName == null) DataMapperFactory.MAPPER_TYPE mapperType =
{ (DataMapperFactory.MAPPER_TYPE)
m_agentsTableName = "agents"; Enum.Parse(typeof (DataMapperFactory.MAPPER_TYPE), mapperTypeStr);
}
database = m_databaseMapper = DataMapperFactory.GetDataBaseMapper(mapperType, m_connectString);
new MySQLManager(settingHostname, settingDatabase, settingUsername, settingPassword, settingPooling,
settingPort); m_appearanceMapper = new AppearanceTableMapper(m_databaseMapper, "AvatarAppearance");
TestTables(); TestTables();
} }
@ -630,15 +654,24 @@ namespace OpenSim.Data.MySQL
/// Appearance /// Appearance
/// TODO: stubs for now to get us to a compiling state gently /// TODO: stubs for now to get us to a compiling state gently
// override public AvatarAppearance GetUserAppearance(LLUUID user) // override
// { public AvatarAppearance GetUserAppearance(LLUUID user)
// return new AvatarAppearance(); {
// } AvatarAppearance appearance = null;
if (!m_appearanceMapper.TryGetValue(user.UUID, out appearance))
{
appearance = new AvatarAppearance();
appearance.Owner = user;
UpdateUserAppearance(user, appearance);
}
return appearance;
}
// override public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance) // override
// { public void UpdateUserAppearance(LLUUID user, AvatarAppearance appearance)
// return; {
// } m_appearanceMapper.Update(user.UUID, appearance);
}
override public void AddAttachment(LLUUID user, LLUUID item) override public void AddAttachment(LLUUID user, LLUUID item)
{ {

3
prebuild.xml
View File

@ -1272,6 +1272,9 @@
<Reference name="System.Data"/> <Reference name="System.Data"/>
<Reference name="OpenSim.Framework"/> <Reference name="OpenSim.Framework"/>
<Reference name="OpenSim.Data"/> <Reference name="OpenSim.Data"/>
<Reference name="OpenSim.Data.MapperFactory"/>
<Reference name="OpenSim.Data.Base"/>
<Reference name="OpenSim.Data.MySQLMapper"/>
<Reference name="libsecondlife.dll"/> <Reference name="libsecondlife.dll"/>
<Reference name="MySql.Data.dll"/> <Reference name="MySql.Data.dll"/>
<Reference name="OpenSim.Framework.Console"/> <Reference name="OpenSim.Framework.Console"/>