And finally renamed the classes themselves.

Relates to http://opensimulator.org/mantis/view.php?id=7398

OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescHandler.cs

@@ -42,7 +42,7 @@ using Caps = OpenSim.Framework.Capabilities.Caps;
 
 namespace OpenSim.Capabilities.Handlers
 {
-    public class WebFetchInvDescHandler 
+    public class FetchInvDescHandler 
     {
         private static readonly ILog m_log =
             LogManager.GetLogger(MethodBase.GetCurrentMethod().DeclaringType);
@@ -51,7 +51,7 @@ namespace OpenSim.Capabilities.Handlers
         private ILibraryService m_LibraryService;
 //        private object m_fetchLock = new Object();
 
-        public WebFetchInvDescHandler(IInventoryService invService, ILibraryService libService) 
+        public FetchInvDescHandler(IInventoryService invService, ILibraryService libService) 
         {
             m_InventoryService = invService;
             m_LibraryService = libService;
@@ -211,9 +211,9 @@ namespace OpenSim.Capabilities.Handlers
             UUID agentID, UUID folderID, UUID ownerID,
             bool fetchFolders, bool fetchItems, int sortOrder, out int version, out int descendents)
         {
-//            m_log.DebugFormat(
-//                "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
-//                fetchFolders, fetchItems, folderID, agentID);
+            //m_log.DebugFormat(
+            //    "[WEB FETCH INV DESC HANDLER]: Fetching folders ({0}), items ({1}) from {2} for agent {3}",
+            //    fetchFolders, fetchItems, folderID, agentID);
 
             // FIXME MAYBE: We're not handling sortOrder!
 

OpenSim/Capabilities/Handlers/FetchInventoryDescendents/FetchInvDescServerConnector.cs

@@ -35,13 +35,13 @@ using OpenMetaverse;
 
 namespace OpenSim.Capabilities.Handlers
 {
-    public class WebFetchInvDescServerConnector : ServiceConnector
+    public class FetchInvDescServerConnector : ServiceConnector
     {
         private IInventoryService m_InventoryService;
         private ILibraryService m_LibraryService;
         private string m_ConfigName = "CapsService";
 
-        public WebFetchInvDescServerConnector(IConfigSource config, IHttpServer server, string configName) :
+        public FetchInvDescServerConnector(IConfigSource config, IHttpServer server, string configName) :
                 base(config, server, configName)
         {
             if (configName != String.Empty)
@@ -67,13 +67,13 @@ namespace OpenSim.Capabilities.Handlers
             m_LibraryService =
                     ServerUtils.LoadPlugin<ILibraryService>(libService, args);
 
-            WebFetchInvDescHandler webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
+            FetchInvDescHandler webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService);
             IRequestHandler reqHandler
                 = new RestStreamHandler(
                     "POST",
                     "/CAPS/WebFetchInvDesc/" /*+ UUID.Random()*/,
                     webFetchHandler.FetchInventoryDescendentsRequest,
-                    "WebFetchInvDesc",
+                    "FetchInvDescendents",
                     null);
             server.AddStreamHandler(reqHandler);
         }

OpenSim/Data/MySQL/MySQLUserProfilesData.cs

@@ -1022,7 +1022,7 @@ namespace OpenSim.Data.MySQL
                                 
                                 using (MySqlCommand put = new MySqlCommand(query, dbcon))
                                 {
-                                    put.Parameters.AddWithValue("?Id", props.UserId.ToString());
+                                    put.Parameters.AddWithValue("?UserId", props.UserId.ToString());
                                     put.Parameters.AddWithValue("?TagId", props.TagId.ToString());
                                     put.Parameters.AddWithValue("?DataKey", props.DataKey.ToString());
                                     put.Parameters.AddWithValue("?DataVal", props.DataVal.ToString());

OpenSim/Data/PGSQL/PGSQLUserProfilesData.cs

@@ -713,12 +713,12 @@ namespace OpenSim.Data.PGSQL
             string query = string.Empty;
             
             query += "UPDATE userprofile SET ";
-            query += "profileURL=:profileURL, ";
-            query += "profileImage=:image, ";
-            query += "profileAboutText=:abouttext,";
-            query += "profileFirstImage=:firstlifeimage,";
-            query += "profileFirstText=:firstlifetext ";
-            query += "WHERE useruuid=:uuid";
+            query += "\"profileURL\"=:profileURL, ";
+            query += "\"profileImage\"=:image, ";
+            query += "\"profileAboutText\"=:abouttext,";
+            query += "\"profileFirstImage\"=:firstlifeimage,";
+            query += "\"profileFirstText\"=:firstlifetext ";
+            query += "WHERE \"useruuid\"=:uuid";
             
             try
             {
@@ -756,12 +756,12 @@ namespace OpenSim.Data.PGSQL
             string query = string.Empty;
             
             query += "UPDATE userprofile SET ";
-            query += "profileWantToMask=:WantMask, ";
-            query += "profileWantToText=:WantText,";
-            query += "profileSkillsMask=:SkillsMask,";
-            query += "profileSkillsText=:SkillsText, ";
-            query += "profileLanguages=:Languages ";
-            query += "WHERE useruuid=:uuid";
+            query += "\"profileWantToMask\"=:WantMask, ";
+            query += "\"profileWantToText\"=:WantText,";
+            query += "\"profileSkillsMask\"=:SkillsMask,";
+            query += "\"profileSkillsText\"=:SkillsText, ";
+            query += "\"profileLanguages\"=:Languages ";
+            query += "WHERE \"useruuid\"=:uuid";
             
             try
             {
@@ -796,7 +796,7 @@ namespace OpenSim.Data.PGSQL
         public OSDArray GetUserImageAssets(UUID avatarId)
         {
             OSDArray data = new OSDArray();
-            string query = "SELECT snapshotuuid FROM {0} WHERE creatoruuid = :Id";
+            string query = "SELECT \"snapshotuuid\" FROM {0} WHERE \"creatoruuid\" = :Id";
 
             try
             {
@@ -804,7 +804,7 @@ namespace OpenSim.Data.PGSQL
                 {
                     dbcon.Open();
 
-                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query, "classifieds"), dbcon))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"classifieds\""), dbcon))
                     {
                         cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
                         
@@ -814,7 +814,7 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["snapshotuuid"]));
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
                                 }
                             }
                         }
@@ -823,7 +823,7 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Close();
                     dbcon.Open();
 
-                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query, "userpicks"), dbcon))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon))
                     {
                         cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
                         
@@ -833,7 +833,7 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["snapshotuuid"]));
+                                    data.Add(new OSDString(reader["snapshotuuid"].ToString()));
                                 }
                             }
                         }
@@ -842,9 +842,9 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Close();
                     dbcon.Open();
 
-                    query = "SELECT profileImage, profileFirstImage FROM userprofile WHERE useruuid = :Id";
+                    query = "SELECT \"profileImage\", \"profileFirstImage\" FROM \"userprofile\" WHERE \"useruuid\" = :Id";
 
-                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query, "userpicks"), dbcon))
+                    using (NpgsqlCommand cmd = new NpgsqlCommand(string.Format (query,"\"userpicks\""), dbcon))
                     {
                         cmd.Parameters.Add(m_database.CreateParameter("Id", avatarId));
                         
@@ -854,8 +854,8 @@ namespace OpenSim.Data.PGSQL
                             {
                                 while (reader.Read())
                                 {
-                                    data.Add(new OSDString((string)reader["profileImage"]));
-                                    data.Add(new OSDString((string)reader["profileFirstImage"]));
+                                    data.Add(new OSDString(reader["profileImage"].ToString()));
+                                    data.Add(new OSDString(reader["profileFirstImage"].ToString()));
                                 }
                             }
                         }
@@ -864,7 +864,7 @@ namespace OpenSim.Data.PGSQL
             }
             catch (Exception e)
             {
-                m_log.Error("[PROFILES_DATA]: GetAvatarNotes exception ", e);
+                m_log.Error("[PROFILES_DATA]: GetUserImageAssets exception ", e);
             }
 
             return data;
@@ -904,6 +904,7 @@ namespace OpenSim.Data.PGSQL
                             {
                                 using (NpgsqlCommand put = new NpgsqlCommand(query, dbcon))
                                 {
+                                    put.Parameters.Add(m_database.CreateParameter("Id", pref.UserId));
                                     query = "INSERT INTO usersettings VALUES ";
                                     query += "(:Id,'false','false', '')";
 
@@ -940,10 +941,10 @@ namespace OpenSim.Data.PGSQL
                     dbcon.Open();
                     using (NpgsqlCommand cmd = new NpgsqlCommand(query, dbcon))
                     {
-                        cmd.Parameters.Add(m_database.CreateParameter("ImViaEmail", pref.IMViaEmail.ToString().ToLower ()));
-                        cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible.ToString().ToLower ()));
-                        cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower ()));
-                        cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId.ToString()));
+                        cmd.Parameters.Add(m_database.CreateParameter("ImViaEmail", pref.IMViaEmail));
+                        cmd.Parameters.Add(m_database.CreateParameter("Visible", pref.Visible));
+                        cmd.Parameters.Add(m_database.CreateParameter("EMail", pref.EMail.ToString().ToLower()));
+                        cmd.Parameters.Add(m_database.CreateParameter("uuid", pref.UserId));
 
                         cmd.ExecuteNonQuery();
                     }
@@ -968,8 +969,8 @@ namespace OpenSim.Data.PGSQL
             string query = string.Empty;
             
             query += "SELECT * FROM userdata WHERE ";
-            query += "UserId = :Id AND ";
-            query += "TagId = :TagId";
+            query += "\"UserId\" = :Id AND ";
+            query += "\"TagId\" = :TagId";
             
             try
             {
@@ -999,7 +1000,7 @@ namespace OpenSim.Data.PGSQL
                                 
                                 using (NpgsqlCommand put = new NpgsqlCommand(query, dbcon))
                                 {
-                                    put.Parameters.Add(m_database.CreateParameter("Id", props.UserId));
+                                    put.Parameters.Add(m_database.CreateParameter("UserId", props.UserId));
                                     put.Parameters.Add(m_database.CreateParameter("TagId", props.TagId));
                                     put.Parameters.Add(m_database.CreateParameter("DataKey", props.DataKey.ToString()));
                                     put.Parameters.Add(m_database.CreateParameter("DataVal", props.DataVal.ToString()));
@@ -1026,11 +1027,11 @@ namespace OpenSim.Data.PGSQL
             string query = string.Empty;
             
             query += "UPDATE userdata SET ";
-            query += "TagId = :TagId, ";
-            query += "DataKey = :DataKey, ";
-            query += "DataVal = :DataVal WHERE ";
-            query += "UserId = :UserId AND ";
-            query += "TagId = :TagId";
+            query += "\"TagId\" = :TagId, ";
+            query += "\"DataKey\" = :DataKey, ";
+            query += "\"DataVal\" = :DataVal WHERE ";
+            query += "\"UserId\" = :UserId AND ";
+            query += "\"TagId\" = :TagId";
             
             try
             {

OpenSim/Region/ClientStack/Linden/Caps/WebFetchInvDescModule.cs

@@ -94,7 +94,7 @@ namespace OpenSim.Region.ClientStack.Linden
         private string m_fetchInventoryDescendents2Url;
         private string m_webFetchInventoryDescendentsUrl;
 
-        private static WebFetchInvDescHandler m_webFetchHandler;
+        private static FetchInvDescHandler m_webFetchHandler;
 
         private static Thread[] m_workerThreads = null;
 
@@ -197,7 +197,7 @@ namespace OpenSim.Region.ClientStack.Linden
             m_LibraryService = Scene.LibraryService;
 
             // We'll reuse the same handler for all requests.
-            m_webFetchHandler = new WebFetchInvDescHandler(m_InventoryService, m_LibraryService);
+            m_webFetchHandler = new FetchInvDescHandler(m_InventoryService, m_LibraryService);
 
             Scene.EventManager.OnRegisterCaps += RegisterCaps;