ogb912/opensim
1
0
Fork 0
mirror of https://github.com/opensim/opensim.git synced 2026-08-06 01:06:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

further renaming of properties for clarity

Browse Source
This commit is contained in:
Sean Dague
2008-04-10 14:09:30 +00:00
parent c176caeb05
commit 25fea01b92
19 changed files with 205 additions and 205 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
OpenSim/Data/DB4o/DB4oManager.cs
View File

@@ -125,10 +125,10 @@ namespace OpenSim.Data.DB4o
IObjectSet result = database.Get(typeof (UserProfileData));
foreach (UserProfileData row in result)
{
if (userProfiles.ContainsKey(row.Id))
userProfiles[row.Id] = row;
if (userProfiles.ContainsKey(row.ID))
userProfiles[row.ID] = row;
else
userProfiles.Add(row.Id, row);
userProfiles.Add(row.ID, row);
}
database.Close();
}
@@ -145,13 +145,13 @@ namespace OpenSim.Data.DB4o
/// <returns>true on success, false on fail to persist to db</returns>
public bool UpdateRecord(UserProfileData record)
{
if (userProfiles.ContainsKey(record.Id))
if (userProfiles.ContainsKey(record.ID))
{
userProfiles[record.Id] = record;
userProfiles[record.ID] = record;
}
else
{
userProfiles.Add(record.Id, record);
userProfiles.Add(record.ID, record);
}
try

14
OpenSim/Data/MSSQL/MSSQLManager.cs
View File

@@ -300,7 +300,7 @@ namespace OpenSim.Data.MSSQL
if (reader.Read())
{
retval.Id = new LLUUID((string)reader["UUID"]);
retval.ID = new LLUUID((string)reader["UUID"]);
retval.FirstName = (string)reader["username"];
retval.SurName = (string)reader["lastname"];
@@ -323,14 +323,14 @@ namespace OpenSim.Data.MSSQL
retval.UserInventoryURI = (string)reader["userInventoryURI"];
retval.UserAssetURI = (string)reader["userAssetURI"];
retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
retval.ProfileAboutText = (string)reader["profileAboutText"];
retval.ProfileFirstText = (string)reader["profileFirstText"];
retval.AboutText = (string)reader["profileAboutText"];
retval.FirstLifeAboutText = (string)reader["profileFirstText"];
retval.ProfileImage = new LLUUID((string)reader["profileImage"]);
retval.ProfileFirstImage = new LLUUID((string)reader["profileFirstImage"]);
retval.Image = new LLUUID((string)reader["profileImage"]);
retval.FirstLifeImage = new LLUUID((string)reader["profileFirstImage"]);
retval.WebLoginKey = new LLUUID((string)reader["webLoginKey"]);
}
else

26
OpenSim/Data/MSSQL/MSSQLUserData.cs
View File

@@ -453,7 +453,7 @@ namespace OpenSim.Data.MSSQL
override public UserAgentData GetAgentByName(string user, string last)
{
UserProfileData profile = GetUserByName(user, last);
return GetAgentByUUID(profile.Id);
return GetAgentByUUID(profile.ID);
}
/// <summary>
@@ -505,14 +505,14 @@ namespace OpenSim.Data.MSSQL
{
lock (database)
{
InsertUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
InsertUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y,
user.HomeLocation.Z,
user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
user.ProfileCanDoMask, user.ProfileWantDoMask,
user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage,
user.ProfileFirstImage, user.WebLoginKey);
user.CanDoMask, user.WantDoMask,
user.AboutText, user.FirstLifeAboutText, user.Image,
user.FirstLifeImage, user.WebLoginKey);
}
}
catch (Exception e)
@@ -651,7 +651,7 @@ namespace OpenSim.Data.MSSQL
"profileFirstImage = @profileFirstImage, " +
"webLoginKey = @webLoginKey where " +
"UUID = @keyUUUID;", database.getConnection());
SqlParameter param1 = new SqlParameter("@uuid", user.Id.ToString());
SqlParameter param1 = new SqlParameter("@uuid", user.ID.ToString());
SqlParameter param2 = new SqlParameter("@username", user.FirstName);
SqlParameter param3 = new SqlParameter("@lastname", user.SurName);
SqlParameter param4 = new SqlParameter("@passwordHash", user.PasswordHash);
@@ -667,13 +667,13 @@ namespace OpenSim.Data.MSSQL
SqlParameter param14 = new SqlParameter("@lastLogin", Convert.ToInt32(user.LastLogin));
SqlParameter param15 = new SqlParameter("@userInventoryURI", user.UserInventoryURI);
SqlParameter param16 = new SqlParameter("@userAssetURI", user.UserAssetURI);
SqlParameter param17 = new SqlParameter("@profileCanDoMask", Convert.ToInt32(user.ProfileCanDoMask));
SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.ProfileWantDoMask));
SqlParameter param19 = new SqlParameter("@profileAboutText", user.ProfileAboutText);
SqlParameter param20 = new SqlParameter("@profileFirstText", user.ProfileFirstText);
SqlParameter param21 = new SqlParameter("@profileImage", user.ProfileImage.ToString());
SqlParameter param22 = new SqlParameter("@profileFirstImage", user.ProfileFirstImage.ToString());
SqlParameter param23 = new SqlParameter("@keyUUUID", user.Id.ToString());
SqlParameter param17 = new SqlParameter("@profileCanDoMask", Convert.ToInt32(user.CanDoMask));
SqlParameter param18 = new SqlParameter("@profileWantDoMask", Convert.ToInt32(user.WantDoMask));
SqlParameter param19 = new SqlParameter("@profileAboutText", user.AboutText);
SqlParameter param20 = new SqlParameter("@profileFirstText", user.FirstLifeAboutText);
SqlParameter param21 = new SqlParameter("@profileImage", user.Image.ToString());
SqlParameter param22 = new SqlParameter("@profileFirstImage", user.FirstLifeImage.ToString());
SqlParameter param23 = new SqlParameter("@keyUUUID", user.ID.ToString());
SqlParameter param24 = new SqlParameter("@webLoginKey", user.WebLoginKey.UUID.ToString());
command.Parameters.Add(param1);
command.Parameters.Add(param2);

22
OpenSim/Data/MySQL/MySQLManager.cs
View File

@@ -431,7 +431,7 @@ namespace OpenSim.Data.MySQL
if (!LLUUID.TryParse((string)reader["UUID"], out id))
return null;
retval.Id = id;
retval.ID = id;
retval.FirstName = (string) reader["username"];
retval.SurName = (string) reader["lastname"];
@@ -454,33 +454,33 @@ namespace OpenSim.Data.MySQL
retval.UserInventoryURI = (string) reader["userInventoryURI"];
retval.UserAssetURI = (string) reader["userAssetURI"];
retval.ProfileCanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
retval.ProfileWantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
retval.CanDoMask = Convert.ToUInt32(reader["profileCanDoMask"].ToString());
retval.WantDoMask = Convert.ToUInt32(reader["profileWantDoMask"].ToString());
if (reader.IsDBNull(reader.GetOrdinal("profileAboutText")))
retval.ProfileAboutText = "";
retval.AboutText = "";
else
retval.ProfileAboutText = (string) reader["profileAboutText"];
retval.AboutText = (string) reader["profileAboutText"];
if (reader.IsDBNull(reader.GetOrdinal("profileFirstText")))
retval.ProfileFirstText = "";
retval.FirstLifeAboutText = "";
else
retval.ProfileFirstText = (string)reader["profileFirstText"];
retval.FirstLifeAboutText = (string)reader["profileFirstText"];
if (reader.IsDBNull(reader.GetOrdinal("profileImage")))
retval.ProfileImage = LLUUID.Zero;
retval.Image = LLUUID.Zero;
else {
LLUUID tmp;
LLUUID.TryParse((string)reader["profileImage"], out tmp);
retval.ProfileImage = tmp;
retval.Image = tmp;
}
if (reader.IsDBNull(reader.GetOrdinal("profileFirstImage")))
retval.ProfileFirstImage = LLUUID.Zero;
retval.FirstLifeImage = LLUUID.Zero;
else {
LLUUID tmp;
LLUUID.TryParse((string)reader["profileFirstImage"], out tmp);
retval.ProfileFirstImage = tmp;
retval.FirstLifeImage = tmp;
}
if(reader.IsDBNull(reader.GetOrdinal("webLoginKey")))

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

@@ -475,7 +475,7 @@ namespace OpenSim.Data.MySQL
override public UserAgentData GetAgentByName(string user, string last)
{
UserProfileData profile = GetUserByName(user, last);
return GetAgentByUUID(profile.Id);
return GetAgentByUUID(profile.ID);
}
override public void StoreWebLoginKey(LLUUID AgentID, LLUUID WebLoginKey)
@@ -547,14 +547,14 @@ namespace OpenSim.Data.MySQL
{
lock (database)
{
database.insertUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
database.insertUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y,
user.HomeLocation.Z,
user.HomeLookAt.X, user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created,
user.LastLogin, user.UserInventoryURI, user.UserAssetURI,
user.ProfileCanDoMask, user.ProfileWantDoMask,
user.ProfileAboutText, user.ProfileFirstText, user.ProfileImage,
user.ProfileFirstImage, user.WebLoginKey);
user.CanDoMask, user.WantDoMask,
user.AboutText, user.FirstLifeAboutText, user.Image,
user.FirstLifeImage, user.WebLoginKey);
}
}
catch (Exception e)
@@ -590,11 +590,11 @@ namespace OpenSim.Data.MySQL
/// <param name="user">The profile data to use to update the DB</param>
override public bool UpdateUserProfile(UserProfileData user)
{
database.updateUserRow(user.Id, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
database.updateUserRow(user.ID, user.FirstName, user.SurName, user.PasswordHash, user.PasswordSalt,
user.HomeRegion, user.HomeLocation.X, user.HomeLocation.Y, user.HomeLocation.Z, user.HomeLookAt.X,
user.HomeLookAt.Y, user.HomeLookAt.Z, user.Created, user.LastLogin, user.UserInventoryURI,
user.UserAssetURI, user.ProfileCanDoMask, user.ProfileWantDoMask, user.ProfileAboutText,
user.ProfileFirstText, user.ProfileImage, user.ProfileFirstImage, user.WebLoginKey);
user.UserAssetURI, user.CanDoMask, user.WantDoMask, user.AboutText,
user.FirstLifeAboutText, user.Image, user.FirstLifeImage, user.WebLoginKey);
return true;
}

36
OpenSim/Data/SQLite/SQLiteUserData.cs
View File

@@ -135,7 +135,7 @@ namespace OpenSim.Data.SQLite
if (rows.Length > 0)
{
UserProfileData user = buildUserProfile(rows[0]);
DataRow row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(user.Id));
DataRow row = ds.Tables["useragents"].Rows.Find(Util.ToRawUuidString(user.ID));
if (row != null)
{
user.CurrentAgent = buildUserAgent(row);
@@ -365,7 +365,7 @@ namespace OpenSim.Data.SQLite
DataTable users = ds.Tables["users"];
lock (ds)
{
DataRow row = users.Rows.Find(Util.ToRawUuidString(user.Id));
DataRow row = users.Rows.Find(Util.ToRawUuidString(user.ID));
if (row == null)
{
row = users.NewRow();
@@ -384,7 +384,7 @@ namespace OpenSim.Data.SQLite
if (user.CurrentAgent != null)
{
DataTable ua = ds.Tables["useragents"];
row = ua.Rows.Find(Util.ToRawUuidString(user.Id));
row = ua.Rows.Find(Util.ToRawUuidString(user.ID));
if (row == null)
{
row = ua.NewRow();
@@ -401,7 +401,7 @@ namespace OpenSim.Data.SQLite
// I just added this to help the standalone login situation.
//It still needs to be looked at by a Database guy
DataTable ua = ds.Tables["useragents"];
row = ua.Rows.Find(Util.ToRawUuidString(user.Id));
row = ua.Rows.Find(Util.ToRawUuidString(user.ID));
if (row == null)
{
@@ -593,7 +593,7 @@ namespace OpenSim.Data.SQLite
UserProfileData user = new UserProfileData();
LLUUID tmp;
LLUUID.TryParse((String)row["UUID"], out tmp);
user.Id = tmp;
user.ID = tmp;
user.FirstName = (String) row["username"];
user.SurName = (String) row["surname"];
user.PasswordHash = (String) row["passwordHash"];
@@ -616,14 +616,14 @@ namespace OpenSim.Data.SQLite
user.RootInventoryFolderID = new LLUUID((String) row["rootInventoryFolderID"]);
user.UserInventoryURI = (String) row["userInventoryURI"];
user.UserAssetURI = (String) row["userAssetURI"];
user.ProfileCanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
user.ProfileWantDoMask = Convert.ToUInt32(row["profileWantDoMask"]);
user.ProfileAboutText = (String) row["profileAboutText"];
user.ProfileFirstText = (String) row["profileFirstText"];
user.CanDoMask = Convert.ToUInt32(row["profileCanDoMask"]);
user.WantDoMask = Convert.ToUInt32(row["profileWantDoMask"]);
user.AboutText = (String) row["profileAboutText"];
user.FirstLifeAboutText = (String) row["profileFirstText"];
LLUUID.TryParse((String)row["profileImage"], out tmp);
user.ProfileImage = tmp;
user.Image = tmp;
LLUUID.TryParse((String)row["profileFirstImage"], out tmp);
user.ProfileFirstImage = tmp;
user.FirstLifeImage = tmp;
user.WebLoginKey = new LLUUID((String) row["webLoginKey"]);
return user;
@@ -631,7 +631,7 @@ namespace OpenSim.Data.SQLite
private void fillUserRow(DataRow row, UserProfileData user)
{
row["UUID"] = Util.ToRawUuidString(user.Id);
row["UUID"] = Util.ToRawUuidString(user.ID);
row["username"] = user.FirstName;
row["surname"] = user.SurName;
row["passwordHash"] = user.PasswordHash;
@@ -652,12 +652,12 @@ namespace OpenSim.Data.SQLite
row["rootInventoryFolderID"] = user.RootInventoryFolderID;
row["userInventoryURI"] = user.UserInventoryURI;
row["userAssetURI"] = user.UserAssetURI;
row["profileCanDoMask"] = user.ProfileCanDoMask;
row["profileWantDoMask"] = user.ProfileWantDoMask;
row["profileAboutText"] = user.ProfileAboutText;
row["profileFirstText"] = user.ProfileFirstText;
row["profileImage"] = user.ProfileImage;
row["profileFirstImage"] = user.ProfileFirstImage;
row["profileCanDoMask"] = user.CanDoMask;
row["profileWantDoMask"] = user.WantDoMask;
row["profileAboutText"] = user.AboutText;
row["profileFirstText"] = user.FirstLifeAboutText;
row["profileImage"] = user.Image;
row["profileFirstImage"] = user.FirstLifeImage;
row["webLoginKey"] = user.WebLoginKey;
// ADO.NET doesn't handle NULL very well