Merge branch 'master' of ssh://diva@opensimulator.org/var/git/opensim

14 files changed, 83 insertions, 145 deletions

diff --git a/OpenSim/Data/AssetDataBase.cs b/OpenSim/Data/AssetDataBase.cs
index f723ebf..5deb44e 100644
--- a/OpenSim/Data/AssetDataBase.cs
+++ b/OpenSim/Data/AssetDataBase.cs
@@ -36,15 +36,9 @@ namespace OpenSim.Data
 {
     public abstract class AssetDataBase : IAssetDataPlugin
     {
-        public virtual AssetBase FetchAsset(UUID uuid)
-        {
-            return FetchStoredAsset(uuid);
-        }
-
-        protected abstract AssetBase FetchStoredAsset(UUID uuid);
+        public abstract AssetBase GetAsset(UUID uuid);
         
-        public abstract void CreateAsset(AssetBase asset);
-        public abstract void UpdateAsset(AssetBase asset);
+        public abstract void StoreAsset(AssetBase asset);
         public abstract bool ExistsAsset(UUID uuid);
 
         public abstract List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
diff --git a/OpenSim/Data/GridDataBase.cs b/OpenSim/Data/GridDataBase.cs
index 5a30455..a03488b 100644
--- a/OpenSim/Data/GridDataBase.cs
+++ b/OpenSim/Data/GridDataBase.cs
@@ -38,9 +38,8 @@ namespace OpenSim.Data
         public abstract RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
         public abstract List<RegionProfileData> GetRegionsByName(string namePrefix, uint maxNum);
         public abstract bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey);
-        public abstract DataResponse AddProfile(RegionProfileData profile);
+        public abstract DataResponse StoreProfile(RegionProfileData profile);
         public abstract ReservationData GetReservationAtPoint(uint x, uint y);
-        public abstract DataResponse UpdateProfile(RegionProfileData profile);
         public abstract DataResponse DeleteProfile(string uuid);
 
         public abstract void Initialise();
diff --git a/OpenSim/Data/IAssetData.cs b/OpenSim/Data/IAssetData.cs
index d13732b..2149bca 100644
--- a/OpenSim/Data/IAssetData.cs
+++ b/OpenSim/Data/IAssetData.cs
@@ -33,9 +33,8 @@ namespace OpenSim.Data
 {
     public interface IAssetDataPlugin : IPlugin
     {
-        AssetBase FetchAsset(UUID uuid);
-        void CreateAsset(AssetBase asset);
-        void UpdateAsset(AssetBase asset);
+        AssetBase GetAsset(UUID uuid);
+        void StoreAsset(AssetBase asset);
         bool ExistsAsset(UUID uuid);
         List<AssetMetadata> FetchAssetMetadataSet(int start, int count);
         void Initialise(string connect);
diff --git a/OpenSim/Data/IGridData.cs b/OpenSim/Data/IGridData.cs
index 4bf8646..8bd3811 100644
--- a/OpenSim/Data/IGridData.cs
+++ b/OpenSim/Data/IGridData.cs
@@ -99,18 +99,11 @@ namespace OpenSim.Data
         bool AuthenticateSim(UUID UUID, ulong regionHandle, string simrecvkey);
 
         /// <summary>
-        /// Adds a new profile to the database
+        /// Adds or updates a profile in the database
         /// </summary>
         /// <param name="profile">The profile to add</param>
         /// <returns>RESPONSE_OK if successful, error if not.</returns>
-        DataResponse AddProfile(RegionProfileData profile);
-
-        /// <summary>
-        /// Updates a profile in the database
-        /// </summary>
-        /// <param name="profile"></param>
-        /// <returns></returns>
-        DataResponse UpdateProfile(RegionProfileData profile);
+        DataResponse StoreProfile(RegionProfileData profile);
 
         /// <summary>
         /// Remove a profile from the database
diff --git a/OpenSim/Data/MSSQL/MSSQLAssetData.cs b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
index a542584..d193cf5 100644
--- a/OpenSim/Data/MSSQL/MSSQLAssetData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLAssetData.cs
@@ -122,7 +122,7 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="assetID">the asset UUID</param>
         /// <returns></returns>
-        override protected AssetBase FetchStoredAsset(UUID assetID)
+        override public AssetBase GetAsset(UUID assetID)
         {
             string sql = "SELECT * FROM assets WHERE id = @id";
             using (AutoClosingSqlCommand command = m_database.Query(sql))
@@ -152,7 +152,16 @@ namespace OpenSim.Data.MSSQL
         /// Create asset in m_database
         /// </summary>
         /// <param name="asset">the asset</param>
-        override public void CreateAsset(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
+        {
+            if (ExistsAsset(asset.FullID))
+                UpdateAsset(asset);
+            else
+                InsertAsset(asset);
+        }
+
+
+        private void InsertAsset(AssetBase asset)
         {
             if (ExistsAsset(asset.FullID))
             {
@@ -208,7 +217,7 @@ namespace OpenSim.Data.MSSQL
         /// Update asset in m_database
         /// </summary>
         /// <param name="asset">the asset</param>
-        override public void UpdateAsset(AssetBase asset)
+        private void UpdateAsset(AssetBase asset)
         {
             string sql = @"UPDATE assets set id = @id, name = @name, description = @description, assetType = @assetType,
                             local = @local, temporary = @temporary, data = @data
@@ -250,7 +259,7 @@ namespace OpenSim.Data.MSSQL
             }
         }
 
-// Commented out since currently unused - this probably should be called in FetchAsset()
+// Commented out since currently unused - this probably should be called in GetAsset()
 //        private void UpdateAccessTime(AssetBase asset)
 //        {
 //            using (AutoClosingSqlCommand cmd = m_database.Query("UPDATE assets SET access_time = @access_time WHERE id=@id"))
@@ -276,7 +285,7 @@ namespace OpenSim.Data.MSSQL
         /// <returns>true if exist.</returns>
         override public bool ExistsAsset(UUID uuid)
         {
-            if (FetchAsset(uuid) != null)
+            if (GetAsset(uuid) != null)
             {
                 return true;
             }
diff --git a/OpenSim/Data/MSSQL/MSSQLGridData.cs b/OpenSim/Data/MSSQL/MSSQLGridData.cs
index 0ebbf4e..8a3d332 100644
--- a/OpenSim/Data/MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLGridData.cs
@@ -272,26 +272,23 @@ namespace OpenSim.Data.MSSQL
         /// </summary>
         /// <param name="profile">The profile to add</param>
         /// <returns>A dataresponse enum indicating success</returns>
-        override public DataResponse AddProfile(RegionProfileData profile)
+        override public DataResponse StoreProfile(RegionProfileData profile)
         {
-            if (InsertRegionRow(profile))
+            if (GetProfileByUUID(profile.UUID) == null)
             {
-                return DataResponse.RESPONSE_OK;
+                if (InsertRegionRow(profile))
+                {
+                    return DataResponse.RESPONSE_OK;
+                }
             }
-            return DataResponse.RESPONSE_ERROR;
-        }
-
-        /// <summary>
-        /// Update the specified region in the database
-        /// </summary>
-        /// <param name="profile">The profile to update</param>
-        /// <returns>A dataresponse enum indicating success</returns>
-        override public DataResponse UpdateProfile(RegionProfileData profile)
-        {
-            if (UpdateRegionRow(profile))
+            else
             {
-                return DataResponse.RESPONSE_OK;
+                if (UpdateRegionRow(profile))
+                {
+                    return DataResponse.RESPONSE_OK;
+                }
             }
+
             return DataResponse.RESPONSE_ERROR;
         }
 
diff --git a/OpenSim/Data/MySQL/MySQLAssetData.cs b/OpenSim/Data/MySQL/MySQLAssetData.cs
index 0865083..1b4377a 100644
--- a/OpenSim/Data/MySQL/MySQLAssetData.cs
+++ b/OpenSim/Data/MySQL/MySQLAssetData.cs
@@ -135,7 +135,7 @@ namespace OpenSim.Data.MySQL
         /// <param name="assetID">Asset UUID to fetch</param>
         /// <returns>Return the asset</returns>
         /// <remarks>On failure : throw an exception and attempt to reconnect to database</remarks>
-        override protected AssetBase FetchStoredAsset(UUID assetID)
+        override public AssetBase GetAsset(UUID assetID)
         {
             AssetBase asset = null;
             lock (_dbConnection)
@@ -192,7 +192,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="asset">Asset UUID to create</param>
         /// <remarks>On failure : Throw an exception and attempt to reconnect to database</remarks>
-        override public void CreateAsset(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
         {
             lock (_dbConnection)
             {
@@ -285,15 +285,6 @@ namespace OpenSim.Data.MySQL
         }
 
         /// <summary>
-        /// Update a asset in database, see <see cref="CreateAsset"/>
-        /// </summary>
-        /// <param name="asset">Asset UUID to update</param>
-        override public void UpdateAsset(AssetBase asset)
-        {
-            CreateAsset(asset);
-        }
-
-        /// <summary>
         /// check if the asset UUID exist in database
         /// </summary>
         /// <param name="uuid">The asset UUID</param>
diff --git a/OpenSim/Data/MySQL/MySQLGridData.cs b/OpenSim/Data/MySQL/MySQLGridData.cs
index 0a5800b..1ec2609 100644
--- a/OpenSim/Data/MySQL/MySQLGridData.cs
+++ b/OpenSim/Data/MySQL/MySQLGridData.cs
@@ -391,7 +391,7 @@ namespace OpenSim.Data.MySQL
         /// </summary>
         /// <param name="profile">The profile to add</param>
         /// <returns>Successful?</returns>
-        override public DataResponse AddProfile(RegionProfileData profile)
+        override public DataResponse StoreProfile(RegionProfileData profile)
         {
             MySQLSuperManager dbm = GetLockedConnection();
             try {
@@ -408,17 +408,6 @@ namespace OpenSim.Data.MySQL
         }
 
         /// <summary>
-        /// Update a sim profile
-        /// </summary>
-        /// <param name="profile">The profile to update</param>
-        /// <returns>Sucessful?</returns>
-        /// <remarks>Same as AddProfile</remarks>
-        override public DataResponse UpdateProfile(RegionProfileData profile)
-        {
-            return AddProfile(profile);
-        }
-
-        /// <summary>
         /// Deletes a sim profile from the database
         /// </summary>
         /// <param name="uuid">the sim UUID</param>
diff --git a/OpenSim/Data/NHibernate/NHibernateAssetData.cs b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
index 9d8cec5..aaba15c 100644
--- a/OpenSim/Data/NHibernate/NHibernateAssetData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateAssetData.cs
@@ -65,30 +65,24 @@ namespace OpenSim.Data.NHibernate
 
         }
 
-        override protected AssetBase FetchStoredAsset(UUID uuid)
+        override public AssetBase GetAsset(UUID uuid)
         {
             return (AssetBase)manager.Get(typeof(AssetBase), uuid);
         }
 
-        private void Save(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
         {
             AssetBase temp = (AssetBase)manager.Get(typeof(AssetBase), asset.FullID);
             if (temp == null)
             {
+                m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.FullID);
                 manager.Insert(asset);
             }
-        }
-
-        override public void CreateAsset(AssetBase asset)
-        {
-            m_log.InfoFormat("[NHIBERNATE] inserting asset {0}", asset.FullID);
-            Save(asset);
-        }
-
-        override public void UpdateAsset(AssetBase asset)
-        {
-            m_log.InfoFormat("[NHIBERNATE] updating asset {0}", asset.FullID);
-            manager.Update(asset);
+            else
+            {
+                m_log.InfoFormat("[NHIBERNATE] updating asset {0}", asset.FullID);
+                manager.Update(asset);
+            }
         }
 
         // private void LogAssetLoad(AssetBase asset)
@@ -107,7 +101,7 @@ namespace OpenSim.Data.NHibernate
         override public bool ExistsAsset(UUID uuid)
         {
             m_log.InfoFormat("[NHIBERNATE] ExistsAsset: {0}", uuid);
-            return (FetchAsset(uuid) != null);
+            return (GetAsset(uuid) != null);
         }
 
         /// <summary>
diff --git a/OpenSim/Data/NHibernate/NHibernateGridData.cs b/OpenSim/Data/NHibernate/NHibernateGridData.cs
index fe8da59..018af62 100644
--- a/OpenSim/Data/NHibernate/NHibernateGridData.cs
+++ b/OpenSim/Data/NHibernate/NHibernateGridData.cs
@@ -117,7 +117,7 @@ namespace OpenSim.Data.NHibernate
             throw new NotImplementedException();
         }
 
-        public override DataResponse AddProfile(RegionProfileData profile)
+        public override DataResponse StoreProfile(RegionProfileData profile)
         {
             if (manager.Get(typeof(RegionProfileData), profile.Uuid) == null)
             {
@@ -126,21 +126,9 @@ namespace OpenSim.Data.NHibernate
             }
             else
             {
-                return DataResponse.RESPONSE_ERROR;
-            }
-        }
-
-        public override DataResponse UpdateProfile(RegionProfileData profile)
-        {
-            if (manager.Get(typeof(RegionProfileData), profile.Uuid) != null)
-            {
                 manager.Update(profile);
                 return DataResponse.RESPONSE_OK;
             }
-            else
-            {
-                return DataResponse.RESPONSE_ERROR;
-            }
         }
 
         public override DataResponse DeleteProfile(string uuid)
diff --git a/OpenSim/Data/SQLite/SQLiteAssetData.cs b/OpenSim/Data/SQLite/SQLiteAssetData.cs
index 72af7a0..3831467 100644
--- a/OpenSim/Data/SQLite/SQLiteAssetData.cs
+++ b/OpenSim/Data/SQLite/SQLiteAssetData.cs
@@ -90,7 +90,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="uuid">UUID of ... ?</param>
         /// <returns>Asset base</returns>
-        override protected AssetBase FetchStoredAsset(UUID uuid)
+        override public AssetBase GetAsset(UUID uuid)
         {
             lock (this)
             {
@@ -119,18 +119,16 @@ namespace OpenSim.Data.SQLite
         /// Create an asset
         /// </summary>
         /// <param name="asset">Asset Base</param>
-        override public void CreateAsset(AssetBase asset)
+        override public void StoreAsset(AssetBase asset)
         {
             //m_log.Info("[ASSET DB]: Creating Asset " + asset.FullID.ToString());
             if (ExistsAsset(asset.FullID))
             {
-                //m_log.Info("[ASSET DB]: Asset exists already, ignoring.");
-            }
-            else
-            {
+                LogAssetLoad(asset);
+
                 lock (this)
                 {
-                    using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
+                    using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
                     {
                         cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
                         cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
@@ -144,29 +142,22 @@ namespace OpenSim.Data.SQLite
                     }
                 }
             }
-        }
-
-        /// <summary>
-        /// Update an asset
-        /// </summary>
-        /// <param name="asset"></param>
-        override public void UpdateAsset(AssetBase asset)
-        {
-            LogAssetLoad(asset);
-
-            lock (this)
+            else
             {
-                using (SqliteCommand cmd = new SqliteCommand(UpdateAssetSQL, m_conn))
+                lock (this)
                 {
-                    cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
-                    cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
-                    cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
-                    cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
-                    cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
-                    cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
-                    cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
-
-                    cmd.ExecuteNonQuery();
+                    using (SqliteCommand cmd = new SqliteCommand(InsertAssetSQL, m_conn))
+                    {
+                        cmd.Parameters.Add(new SqliteParameter(":UUID", asset.FullID.ToString()));
+                        cmd.Parameters.Add(new SqliteParameter(":Name", asset.Name));
+                        cmd.Parameters.Add(new SqliteParameter(":Description", asset.Description));
+                        cmd.Parameters.Add(new SqliteParameter(":Type", asset.Type));
+                        cmd.Parameters.Add(new SqliteParameter(":Local", asset.Local));
+                        cmd.Parameters.Add(new SqliteParameter(":Temporary", asset.Temporary));
+                        cmd.Parameters.Add(new SqliteParameter(":Data", asset.Data));
+
+                        cmd.ExecuteNonQuery();
+                    }
                 }
             }
         }
diff --git a/OpenSim/Data/SQLite/SQLiteGridData.cs b/OpenSim/Data/SQLite/SQLiteGridData.cs
index 4107594..18abb88 100644
--- a/OpenSim/Data/SQLite/SQLiteGridData.cs
+++ b/OpenSim/Data/SQLite/SQLiteGridData.cs
@@ -203,7 +203,7 @@ namespace OpenSim.Data.SQLite
         /// </summary>
         /// <param name="profile">The profile to add</param>
         /// <returns>A dataresponse enum indicating success</returns>
-        override public DataResponse AddProfile(RegionProfileData profile)
+        override public DataResponse StoreProfile(RegionProfileData profile)
         {
             if (database.insertRow(profile))
             {
@@ -215,17 +215,11 @@ namespace OpenSim.Data.SQLite
             }
         }
 
-        override public DataResponse UpdateProfile(RegionProfileData profile)
-        {
-            return AddProfile(profile);
-        }
-
-                /// <summary>
+        /// <summary>
         /// Deletes a sim profile from the database
         /// </summary>
         /// <param name="uuid">the sim UUID</param>
         /// <returns>Successful?</returns>
-        //public DataResponse DeleteProfile(RegionProfileData profile)
         override public DataResponse DeleteProfile(string uuid)
         {
             Dictionary<string, string> param = new Dictionary<string, string>();
diff --git a/OpenSim/Data/Tests/BasicAssetTest.cs b/OpenSim/Data/Tests/BasicAssetTest.cs
index 09131c1..1969d76 100644
--- a/OpenSim/Data/Tests/BasicAssetTest.cs
+++ b/OpenSim/Data/Tests/BasicAssetTest.cs
@@ -84,34 +84,34 @@ namespace OpenSim.Data.Tests
             scrambler.Scramble(a2);
             scrambler.Scramble(a3);
 
-            db.CreateAsset(a1);
-            db.CreateAsset(a2);
-            db.CreateAsset(a3);
+            db.StoreAsset(a1);
+            db.StoreAsset(a2);
+            db.StoreAsset(a3);
             
-            AssetBase a1a = db.FetchAsset(uuid1);
+            AssetBase a1a = db.GetAsset(uuid1);
             Assert.That(a1a, Constraints.PropertyCompareConstraint(a1));
 
-            AssetBase a2a = db.FetchAsset(uuid2);
+            AssetBase a2a = db.GetAsset(uuid2);
             Assert.That(a2a, Constraints.PropertyCompareConstraint(a2));
 
-            AssetBase a3a = db.FetchAsset(uuid3);
+            AssetBase a3a = db.GetAsset(uuid3);
             Assert.That(a3a, Constraints.PropertyCompareConstraint(a3));
 
             scrambler.Scramble(a1a);
             scrambler.Scramble(a2a);
             scrambler.Scramble(a3a);
 
-            db.UpdateAsset(a1a);
-            db.UpdateAsset(a2a);
-            db.UpdateAsset(a3a);
+            db.StoreAsset(a1a);
+            db.StoreAsset(a2a);
+            db.StoreAsset(a3a);
 
-            AssetBase a1b = db.FetchAsset(uuid1);
+            AssetBase a1b = db.GetAsset(uuid1);
             Assert.That(a1b, Constraints.PropertyCompareConstraint(a1a));
 
-            AssetBase a2b = db.FetchAsset(uuid2);
+            AssetBase a2b = db.GetAsset(uuid2);
             Assert.That(a2b, Constraints.PropertyCompareConstraint(a2a));
 
-            AssetBase a3b = db.FetchAsset(uuid3);
+            AssetBase a3b = db.GetAsset(uuid3);
             Assert.That(a3b, Constraints.PropertyCompareConstraint(a3a));
 
             Assert.That(db.ExistsAsset(uuid1), Is.True);
diff --git a/OpenSim/Data/Tests/BasicGridTest.cs b/OpenSim/Data/Tests/BasicGridTest.cs
index de8fb48..df6c669 100644
--- a/OpenSim/Data/Tests/BasicGridTest.cs
+++ b/OpenSim/Data/Tests/BasicGridTest.cs
@@ -70,7 +70,7 @@ namespace OpenSim.Data.Tests
             reg.Uuid = regionUUID;
             reg.RegionName = regionName;
 
-            db.AddProfile(reg);
+            db.StoreProfile(reg);
 
             return reg;
         }
@@ -120,7 +120,7 @@ namespace OpenSim.Data.Tests
             RegionProfileData retreg = db.GetProfileByUUID(region2);
             retreg.regionName = "Gotham City";
 
-            db.UpdateProfile(retreg);
+            db.StoreProfile(retreg);
 
             retreg = db.GetProfileByUUID(region2);
             Assert.That(retreg.RegionName, Is.EqualTo("Gotham City"), "Assert.That(retreg.RegionName, Is.EqualTo(\"Gotham City\"))");
@@ -135,13 +135,13 @@ namespace OpenSim.Data.Tests
             retreg.RegionName = "Gotham Town";
             retreg.Uuid = region1;
 
-            db.AddProfile(retreg);
+            db.StoreProfile(retreg);
 
             retreg = db.GetProfileByUUID(region2);
             retreg.RegionName = "Gothan Town";
             retreg.Uuid = region3;
 
-            db.AddProfile(retreg);
+            db.StoreProfile(retreg);
 
             List<RegionProfileData> listreg = db.GetRegionsByName("Gotham",10);