4 files changed, 112 insertions, 98 deletions

diff --git a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
index 5009d9e..8a7e869 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLInventoryData.cs
@@ -132,7 +132,7 @@ 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);
+                    IDbCommand result = database.Query("SELECT * FROM inventoryfolders WHERE parentFolderID = ?zero AND (agentID = ?uuid OR category = 0)", param);
                     IDataReader reader = result.ExecuteReader();
 
                     List<InventoryFolderBase> items = database.readInventoryFolders(reader);
@@ -152,40 +152,6 @@ namespace OpenSim.Framework.Data.MySQL
         }
 
         /// <summary>
-        /// Returns the users inventory root folder.
-        /// </summary>
-        /// <param name="user"></param>
-        /// <returns></returns>
-        public InventoryFolderBase getUserRootFolder(LLUUID user)
-        {
-            try
-            {
-                lock (database)
-                {
-                    Dictionary<string, string> param = new Dictionary<string, string>();
-                    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();
-
-                    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();
-
-                    return rootFolder;
-                }
-            }
-            catch (Exception e)
-            {
-                database.Reconnect();
-                Console.WriteLine(e.ToString());
-                return null;
-            }
-        }
-
-        /// <summary>
         /// Returns a list of folders in a users inventory contained within the specified folder
         /// </summary>
         /// <param name="parentID">The folder to search</param>
@@ -348,5 +314,27 @@ namespace OpenSim.Framework.Data.MySQL
         {
             addInventoryFolder(folder);
         }
+
+        public void deleteInventoryCategory(InventoryCategory inventoryCategory)
+        {
+            try
+            {
+                lock (database) {
+                    IDbCommand cmd = database.Query(string.Format("DELETE FROM inventoryitems WHERE parentFolderID IN (SELECT folderId FROM inventoryfolders WHERE category={0})", (byte)inventoryCategory), null);
+                    cmd.ExecuteNonQuery();
+
+
+                    cmd = database.Query(string.Format("DELETE FROM inventoryfolders WHERE category={0}", (byte)inventoryCategory), null);
+                    cmd.ExecuteNonQuery();
+                }
+
+            }
+            catch (Exception e)
+            {
+                database.Reconnect();
+                Console.WriteLine(e.ToString());
+            }
+        }
+
     }
 }
diff --git a/OpenSim/Framework/Data.MySQL/MySQLManager.cs b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
index 5037f98..e55606e 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLManager.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLManager.cs
@@ -41,7 +41,7 @@ namespace OpenSim.Framework.Data.MySQL
         /// <summary>
         /// The database connection object
         /// </summary>
-        IDbConnection dbcon;
+        MySqlConnection dbcon;
         /// <summary>
         /// Connection string for ADO.net
         /// </summary>
@@ -115,10 +115,11 @@ namespace OpenSim.Framework.Data.MySQL
             {
                 MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
                 dbcommand.CommandText = sql;
-                foreach (KeyValuePair<string, string> param in parameters)
-                {
-                    dbcommand.Parameters.Add(param.Key, param.Value);
-                }
+                if(parameters != null)
+                    foreach (KeyValuePair<string, string> param in parameters)
+                    {
+                        dbcommand.Parameters.Add(param.Key, param.Value);
+                    }
 
                 return (IDbCommand)dbcommand;
             }
@@ -149,10 +150,11 @@ namespace OpenSim.Framework.Data.MySQL
                     {
                         MySqlCommand dbcommand = (MySqlCommand)dbcon.CreateCommand();
                         dbcommand.CommandText = sql;
-                        foreach (KeyValuePair<string, string> param in parameters)
-                        {
-                            dbcommand.Parameters.Add(param.Key, param.Value);
-                        }
+                        if(parameters != null) 
+                            foreach (KeyValuePair<string, string> param in parameters)
+                            {
+                                dbcommand.Parameters.Add(param.Key, param.Value);
+                            }
 
                         return (IDbCommand)dbcommand;
                     }
@@ -370,6 +372,8 @@ namespace OpenSim.Framework.Data.MySQL
                     folder.parentID = new LLUUID((string)reader["parentFolderID"]);
                     folder.folderID = new LLUUID((string)reader["folderID"]);
                     folder.name = (string)reader["folderName"];
+                    folder.category = (InventoryCategory)((Int16)reader["category"]);
+                    folder.type = (Int16)reader["folderType"];
 
                     rows.Add(folder);
                 }
@@ -509,24 +513,32 @@ namespace OpenSim.Framework.Data.MySQL
         /// <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;
-
+            string sql = "REPLACE INTO inventoryfolders (folderID, agentID, parentFolderID, folderName, category, folderType) VALUES ";
+            sql += "(?folderID, ?agentID, ?parentFolderID, ?folderName, ?category, ?folderType)";
+
+            MySqlCommand dbcmd = dbcon.CreateCommand();
+            dbcmd.CommandText = sql;
+
+            LLUUID tmpID = folder.folderID;
+            dbcmd.Parameters.Add(new MySqlParameter("?folderID", tmpID.ToStringHyphenated()));
+            dbcmd.Parameters.Add(new MySqlParameter("?folderID", tmpID.ToStringHyphenated()));
+            tmpID = folder.agentID;
+            dbcmd.Parameters.Add(new MySqlParameter("?agentID", tmpID.ToStringHyphenated()));
+            tmpID = folder.parentID;
+            dbcmd.Parameters.Add(new MySqlParameter("?parentFolderID", tmpID.ToStringHyphenated()));
+            dbcmd.Parameters.Add(new MySqlParameter("?folderName", folder.name));
+            MySqlParameter p = dbcmd.Parameters.Add(new MySqlParameter("?category", MySqlDbType.Byte));
+            p.Value = (byte)folder.category;
+
+            p = dbcmd.Parameters.Add(new MySqlParameter("?folderType", MySqlDbType.Byte));
+            p.Value = (byte)folder.type;
+
+            
             bool returnval = false;
             try
             {
-                IDbCommand result = Query(sql, parameters);
-
-                if (result.ExecuteNonQuery() == 1)
+                if (dbcmd.ExecuteNonQuery() == 1)
                     returnval = true;
-
-                result.Dispose();
             }
             catch (Exception e)
             {
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
index d3d752f..cac992c 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteInventoryStore.cs
@@ -61,6 +61,7 @@ namespace OpenSim.Framework.Data.SQLite
             MainLog.Instance.Verbose("DATASTORE", "Populated Intentory Items Definitions");
 
             ds.AcceptChanges();
+
             return;
         }
 
@@ -195,43 +196,16 @@ namespace OpenSim.Framework.Data.SQLite
         /// <returns>A list of folder objects</returns>
         public List<InventoryFolderBase> getUserRootFolders(LLUUID user)
         {
-            return null;
-        }
-
-        /// <summary>
-        /// Returns the users inventory root folder.
-        /// </summary>
-        /// <param name="user">The UUID of the user who is having inventory being returned</param>
-        /// <returns>Root inventory folder</returns>
-        public InventoryFolderBase getUserRootFolder(LLUUID user)
-        {
             List<InventoryFolderBase> folders = new List<InventoryFolderBase>();
             DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
-            string selectExp = "agentID = '" + user.ToString() + "' AND parentID = '" + LLUUID.Zero.ToString() + "'";
+
+            string selectExp = "parentID = '" + LLUUID.Zero.ToString() + "' AND (agentID = '" + user.ToString() + "' OR category = 0)";
             DataRow[] rows = inventoryFolderTable.Select(selectExp);
             foreach (DataRow row in rows)
             {
                 folders.Add(this.buildFolder(row));
             }
-
-            if (folders.Count == 1)
-            {
-                //we found the root
-                //System.Console.WriteLine("found root inventory folder");
-                return folders[0];
-            }
-            else if (folders.Count > 1)
-            {
-                //err shouldn't be more than one root
-                //System.Console.WriteLine("found more than one root inventory folder");
-            }
-            else if (folders.Count == 0)
-            {
-                // no root?
-                //System.Console.WriteLine("couldn't find root inventory folder");
-            }
-
-            return null;
+            return folders;
         }
 
         /// <summary>
@@ -270,7 +244,14 @@ namespace OpenSim.Framework.Data.SQLite
         /// <returns>A class containing folder information</returns>
         public InventoryFolderBase getInventoryFolder(LLUUID folder)
         {
-            return null;
+            DataTable inventoryFolderTable = ds.Tables["inventoryfolders"];
+            string selectExp = "UUID = '" + folder.ToString() + "'";
+            DataRow[] rows = inventoryFolderTable.Select(selectExp);
+
+            if (rows.Length == 1)
+                return this.buildFolder(rows[0]);
+            else
+                return null;
         }
 
         /// <summary>
@@ -308,6 +289,11 @@ namespace OpenSim.Framework.Data.SQLite
              this.invItemsDa.Update(ds, "inventoryitems");
         }
 
+        //TODO! Implement SQLite deleteInventoryCategory
+        public void deleteInventoryCategory(InventoryCategory inventoryCategory)
+        {
+        }
+
         /// <summary>
         /// Adds a new folder specified by folder
         /// </summary>
@@ -326,6 +312,11 @@ namespace OpenSim.Framework.Data.SQLite
             this.addFolder(folder);
         }
 
+        //TODO! implement CreateNewUserInventory
+        public void CreateNewUserInventory(LLUUID user)
+        {
+            throw new Exception("Function not implemented");
+        }
 
         /***********************************************************************
          *
@@ -350,6 +341,7 @@ namespace OpenSim.Framework.Data.SQLite
             createCol(inv, "parentFolderID", typeof(System.String));
             createCol(inv, "avatarID", typeof(System.String));
             createCol(inv, "creatorsID", typeof(System.String));
+            createCol(inv, "category", typeof(System.Byte));
 
             createCol(inv, "inventoryName", typeof(System.String));
             createCol(inv, "inventoryDescription", typeof(System.String));
@@ -373,6 +365,7 @@ namespace OpenSim.Framework.Data.SQLite
             createCol(fol, "parentID", typeof(System.String));
             createCol(fol, "type", typeof(System.Int32));
             createCol(fol, "version", typeof(System.Int32));
+            createCol(fol, "category", typeof(System.Byte));
             
             fol.PrimaryKey = new DataColumn[] { fol.Columns["UUID"] };
             return fol;
@@ -415,6 +408,7 @@ namespace OpenSim.Framework.Data.SQLite
             folder.parentID = new LLUUID((string)row["parentID"]);
             folder.type = Convert.ToInt16(row["type"]);
             folder.version = Convert.ToUInt16(row["version"]);
+            folder.category = (InventoryCategory)Convert.ToByte(row["category"]);
             return folder;
         }
 
@@ -426,6 +420,7 @@ namespace OpenSim.Framework.Data.SQLite
             row["parentID"] = folder.parentID;
             row["type"] = folder.type;
             row["version"] = folder.version;
+            row["category"] = folder.category;
         }
 
 
@@ -644,3 +639,7 @@ namespace OpenSim.Framework.Data.SQLite
     }
 }
 
+
+
+
+
diff --git a/OpenSim/Framework/Data/InventoryData.cs b/OpenSim/Framework/Data/InventoryData.cs
index 2df26e1..dc857d8 100644
--- a/OpenSim/Framework/Data/InventoryData.cs
+++ b/OpenSim/Framework/Data/InventoryData.cs
@@ -25,15 +25,19 @@
 * SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 * 
 */
+using System;
+using System.Xml.Serialization;
 using System.Collections.Generic;
 using libsecondlife;
 
 namespace OpenSim.Framework.Data
 {
+
+    public enum InventoryCategory : byte { Library, Default, User };
     /// <summary>
     /// Inventory Item - contains all the properties associated with an individual inventory piece.
     /// </summary>
-    public class InventoryItemBase
+    public class InventoryItemBase : MarshalByRefObject
     {
         /// <summary>
         /// A UUID containing the ID for the inventory item itself
@@ -66,10 +70,12 @@ namespace OpenSim.Framework.Data
         /// <summary>
         /// The name of the inventory item (must be less than 64 characters)
         /// </summary>
+        [XmlElement(ElementName="name")]
         public string inventoryName;
         /// <summary>
         /// The description of the inventory item (must be less than 64 characters)
         /// </summary>
+        [XmlElement(ElementName = "description")]
         public string inventoryDescription;
         /// <summary>
         /// A mask containing the permissions for the next owner (cannot be enforced)
@@ -92,7 +98,7 @@ namespace OpenSim.Framework.Data
     /// <summary>
     /// A Class for folders which contain users inventory
     /// </summary>
-    public class InventoryFolderBase
+    public class InventoryFolderBase : MarshalByRefObject
     {
         /// <summary>
         /// The name of the folder (64 characters or less)
@@ -118,6 +124,10 @@ namespace OpenSim.Framework.Data
         /// 
         /// </summary>
         public ushort version;
+        /// <summary>
+        /// Inventory category, Library, Default, System
+        /// </summary>
+        public InventoryCategory category;
     }
 
     /// <summary>
@@ -162,13 +172,6 @@ namespace OpenSim.Framework.Data
         List<InventoryFolderBase> getUserRootFolders(LLUUID user);
 
         /// <summary>
-        /// Returns the users inventory root folder.
-        /// </summary>
-        /// <param name="user">The UUID of the user who is having inventory being returned</param>
-        /// <returns>Root inventory folder</returns>
-        InventoryFolderBase getUserRootFolder(LLUUID user);
-
-        /// <summary>
         /// Returns a list of inventory folders contained in the folder 'parentID'
         /// </summary>
         /// <param name="parentID">The folder to get subfolders for</param>
@@ -218,5 +221,17 @@ namespace OpenSim.Framework.Data
         /// </summary>
         /// <param name="folder">The inventory folder</param>
         void updateInventoryFolder(InventoryFolderBase folder);
+
+        /// <summary>
+        /// Delete a complete inventory category
+        /// </summary>
+        /// <param name="inventoryCategory">What folder category shout be deleted</param>
+        void deleteInventoryCategory(InventoryCategory inventoryCategory);
+
+        /// <summary>
+        /// Setup the initial folderset of a user
+        /// </summary>
+        /// <param name="user"></param>
+        //void CreateNewUserInventory(LLUUID user);
     }
 }