aboutsummaryrefslogtreecommitdiffstatshomepage
diff options
context:
space:
mode:
authorlbsa712008-03-28 15:05:06 +0000
committerlbsa712008-03-28 15:05:06 +0000
commit0e16488ca8898de80b8e169d03a78c64a9e26816 (patch)
tree87ed81db2cbef41523b25cf6525267550792fa66
parentattempt to fix mantis # 779. (diff)
downloadopensim-SC-0e16488ca8898de80b8e169d03a78c64a9e26816.zip
opensim-SC-0e16488ca8898de80b8e169d03a78c64a9e26816.tar.gz
opensim-SC-0e16488ca8898de80b8e169d03a78c64a9e26816.tar.bz2
opensim-SC-0e16488ca8898de80b8e169d03a78c64a9e26816.tar.xz
* Introduced base abstract provider class for GridData
-rw-r--r--OpenSim/Framework/Data.DB4o/DB4oGridData.cs24
-rw-r--r--OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs24
-rw-r--r--OpenSim/Framework/Data.MySQL/MySQLGridData.cs24
-rw-r--r--OpenSim/Framework/Data.SQLite/SQLiteGridData.cs24
-rw-r--r--OpenSim/Framework/Data/GridDataBase.cs14
5 files changed, 61 insertions, 49 deletions
diff --git a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
index 9320ef9..31b13e3 100644
--- a/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
+++ b/OpenSim/Framework/Data.DB4o/DB4oGridData.cs
@@ -34,7 +34,7 @@ namespace OpenSim.Framework.Data.DB4o
34 /// <summary> 34 /// <summary>
35 /// A grid server storage mechanism employing the DB4o database system 35 /// A grid server storage mechanism employing the DB4o database system
36 /// </summary> 36 /// </summary>
37 internal class DB4oGridData : IGridData 37 internal class DB4oGridData : GridDataBase
38 { 38 {
39 /// <summary> 39 /// <summary>
40 /// The database manager object 40 /// The database manager object
@@ -44,7 +44,7 @@ namespace OpenSim.Framework.Data.DB4o
44 /// <summary> 44 /// <summary>
45 /// Called when the plugin is first loaded (as constructors are not called) 45 /// Called when the plugin is first loaded (as constructors are not called)
46 /// </summary> 46 /// </summary>
47 public void Initialise() 47 override public void Initialise()
48 { 48 {
49 manager = new DB4oGridManager("gridserver.yap"); 49 manager = new DB4oGridManager("gridserver.yap");
50 } 50 }
@@ -57,7 +57,7 @@ namespace OpenSim.Framework.Data.DB4o
57 /// <param name="c">maximum X coordinate</param> 57 /// <param name="c">maximum X coordinate</param>
58 /// <param name="d">maximum Y coordinate</param> 58 /// <param name="d">maximum Y coordinate</param>
59 /// <returns>An array of region profiles</returns> 59 /// <returns>An array of region profiles</returns>
60 public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d) 60 override public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
61 { 61 {
62 return null; 62 return null;
63 } 63 }
@@ -67,7 +67,7 @@ namespace OpenSim.Framework.Data.DB4o
67 /// </summary> 67 /// </summary>
68 /// <param name="handle">The handle to search for</param> 68 /// <param name="handle">The handle to search for</param>
69 /// <returns>A region profile</returns> 69 /// <returns>A region profile</returns>
70 public RegionProfileData GetProfileByHandle(ulong handle) 70 override public RegionProfileData GetProfileByHandle(ulong handle)
71 { 71 {
72 lock (manager.simProfiles) 72 lock (manager.simProfiles)
73 { 73 {
@@ -87,7 +87,7 @@ namespace OpenSim.Framework.Data.DB4o
87 /// </summary> 87 /// </summary>
88 /// <param name="uuid">The region ID code</param> 88 /// <param name="uuid">The region ID code</param>
89 /// <returns>A region profile</returns> 89 /// <returns>A region profile</returns>
90 public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 90 override public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
91 { 91 {
92 lock (manager.simProfiles) 92 lock (manager.simProfiles)
93 { 93 {
@@ -98,7 +98,7 @@ namespace OpenSim.Framework.Data.DB4o
98 "). Total Registered Regions: " + manager.simProfiles.Count); 98 "). Total Registered Regions: " + manager.simProfiles.Count);
99 } 99 }
100 100
101 public RegionProfileData GetProfileByString(string regionName) 101 override public RegionProfileData GetProfileByString(string regionName)
102 { 102 {
103 throw new Exception("GetProfileByString Not supported in DB4oGridData"); 103 throw new Exception("GetProfileByString Not supported in DB4oGridData");
104 //return null; 104 //return null;
@@ -109,7 +109,7 @@ namespace OpenSim.Framework.Data.DB4o
109 /// </summary> 109 /// </summary>
110 /// <param name="profile">The profile to add</param> 110 /// <param name="profile">The profile to add</param>
111 /// <returns>A dataresponse enum indicating success</returns> 111 /// <returns>A dataresponse enum indicating success</returns>
112 public DataResponse AddProfile(RegionProfileData profile) 112 override public DataResponse AddProfile(RegionProfileData profile)
113 { 113 {
114 lock (manager.simProfiles) 114 lock (manager.simProfiles)
115 { 115 {
@@ -131,7 +131,7 @@ namespace OpenSim.Framework.Data.DB4o
131 /// <param name="handle">The location the region is logging into (unused in Db4o)</param> 131 /// <param name="handle">The location the region is logging into (unused in Db4o)</param>
132 /// <param name="key">The shared secret</param> 132 /// <param name="key">The shared secret</param>
133 /// <returns>Authenticated?</returns> 133 /// <returns>Authenticated?</returns>
134 public bool AuthenticateSim(LLUUID uuid, ulong handle, string key) 134 override public bool AuthenticateSim(LLUUID uuid, ulong handle, string key)
135 { 135 {
136 if (manager.simProfiles[uuid].regionRecvKey == key) 136 if (manager.simProfiles[uuid].regionRecvKey == key)
137 return true; 137 return true;
@@ -141,7 +141,7 @@ namespace OpenSim.Framework.Data.DB4o
141 /// <summary> 141 /// <summary>
142 /// Shuts down the database 142 /// Shuts down the database
143 /// </summary> 143 /// </summary>
144 public void Close() 144 override public void Close()
145 { 145 {
146 manager = null; 146 manager = null;
147 } 147 }
@@ -160,7 +160,7 @@ namespace OpenSim.Framework.Data.DB4o
160 /// Returns the providers name 160 /// Returns the providers name
161 /// </summary> 161 /// </summary>
162 /// <returns>The name of the storage system</returns> 162 /// <returns>The name of the storage system</returns>
163 public string getName() 163 override public string getName()
164 { 164 {
165 return "DB4o Grid Provider"; 165 return "DB4o Grid Provider";
166 } 166 }
@@ -169,12 +169,12 @@ namespace OpenSim.Framework.Data.DB4o
169 /// Returns the providers version 169 /// Returns the providers version
170 /// </summary> 170 /// </summary>
171 /// <returns>The version of the storage system</returns> 171 /// <returns>The version of the storage system</returns>
172 public string getVersion() 172 override public string getVersion()
173 { 173 {
174 return "0.1"; 174 return "0.1";
175 } 175 }
176 176
177 public ReservationData GetReservationAtPoint(uint x, uint y) 177 override public ReservationData GetReservationAtPoint(uint x, uint y)
178 { 178 {
179 return null; 179 return null;
180 } 180 }
diff --git a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
index 5a0f3f5..9bd8acc 100644
--- a/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
+++ b/OpenSim/Framework/Data.MSSQL/MSSQLGridData.cs
@@ -38,7 +38,7 @@ namespace OpenSim.Framework.Data.MSSQL
38 /// <summary> 38 /// <summary>
39 /// A grid data interface for Microsoft SQL Server 39 /// A grid data interface for Microsoft SQL Server
40 /// </summary> 40 /// </summary>
41 public class MSSQLGridData : IGridData 41 public class MSSQLGridData : GridDataBase
42 { 42 {
43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 43 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
44 44
@@ -52,7 +52,7 @@ namespace OpenSim.Framework.Data.MSSQL
52 /// <summary> 52 /// <summary>
53 /// Initialises the Grid Interface 53 /// Initialises the Grid Interface
54 /// </summary> 54 /// </summary>
55 public void Initialise() 55 override public void Initialise()
56 { 56 {
57 IniFile iniFile = new IniFile("mssql_connection.ini"); 57 IniFile iniFile = new IniFile("mssql_connection.ini");
58 58
@@ -94,7 +94,7 @@ namespace OpenSim.Framework.Data.MSSQL
94 /// <summary> 94 /// <summary>
95 /// Shuts down the grid interface 95 /// Shuts down the grid interface
96 /// </summary> 96 /// </summary>
97 public void Close() 97 override public void Close()
98 { 98 {
99 database.Close(); 99 database.Close();
100 } 100 }
@@ -103,7 +103,7 @@ namespace OpenSim.Framework.Data.MSSQL
103 /// Returns the storage system name 103 /// Returns the storage system name
104 /// </summary> 104 /// </summary>
105 /// <returns>A string containing the storage system name</returns> 105 /// <returns>A string containing the storage system name</returns>
106 public string getName() 106 override public string getName()
107 { 107 {
108 return "Sql OpenGridData"; 108 return "Sql OpenGridData";
109 } 109 }
@@ -112,7 +112,7 @@ namespace OpenSim.Framework.Data.MSSQL
112 /// Returns the storage system version 112 /// Returns the storage system version
113 /// </summary> 113 /// </summary>
114 /// <returns>A string containing the storage system version</returns> 114 /// <returns>A string containing the storage system version</returns>
115 public string getVersion() 115 override public string getVersion()
116 { 116 {
117 return "0.1"; 117 return "0.1";
118 } 118 }
@@ -125,7 +125,7 @@ namespace OpenSim.Framework.Data.MSSQL
125 /// <param name="c">maximum X coordinate</param> 125 /// <param name="c">maximum X coordinate</param>
126 /// <param name="d">maximum Y coordinate</param> 126 /// <param name="d">maximum Y coordinate</param>
127 /// <returns>An array of region profiles</returns> 127 /// <returns>An array of region profiles</returns>
128 public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d) 128 override public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
129 { 129 {
130 return null; 130 return null;
131 } 131 }
@@ -135,7 +135,7 @@ namespace OpenSim.Framework.Data.MSSQL
135 /// </summary> 135 /// </summary>
136 /// <param name="handle">Region location handle</param> 136 /// <param name="handle">Region location handle</param>
137 /// <returns>Sim profile</returns> 137 /// <returns>Sim profile</returns>
138 public RegionProfileData GetProfileByHandle(ulong handle) 138 override public RegionProfileData GetProfileByHandle(ulong handle)
139 { 139 {
140 IDataReader reader = null; 140 IDataReader reader = null;
141 try 141 try
@@ -166,7 +166,7 @@ namespace OpenSim.Framework.Data.MSSQL
166 /// </summary> 166 /// </summary>
167 /// <param name="uuid">The region UUID</param> 167 /// <param name="uuid">The region UUID</param>
168 /// <returns>The sim profile</returns> 168 /// <returns>The sim profile</returns>
169 public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 169 override public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
170 { 170 {
171 Dictionary<string, string> param = new Dictionary<string, string>(); 171 Dictionary<string, string> param = new Dictionary<string, string>();
172 param["uuid"] = uuid.ToString(); 172 param["uuid"] = uuid.ToString();
@@ -185,7 +185,7 @@ namespace OpenSim.Framework.Data.MSSQL
185 /// </summary> 185 /// </summary>
186 /// <param name="uuid">The region name search query</param> 186 /// <param name="uuid">The region name search query</param>
187 /// <returns>The sim profile</returns> 187 /// <returns>The sim profile</returns>
188 public RegionProfileData GetProfileByString(string regionName) 188 override public RegionProfileData GetProfileByString(string regionName)
189 { 189 {
190 if (regionName.Length > 2) 190 if (regionName.Length > 2)
191 { 191 {
@@ -226,7 +226,7 @@ namespace OpenSim.Framework.Data.MSSQL
226 /// </summary> 226 /// </summary>
227 /// <param name="profile">The profile to add</param> 227 /// <param name="profile">The profile to add</param>
228 /// <returns>A dataresponse enum indicating success</returns> 228 /// <returns>A dataresponse enum indicating success</returns>
229 public DataResponse AddProfile(RegionProfileData profile) 229 override public DataResponse AddProfile(RegionProfileData profile)
230 { 230 {
231 try 231 try
232 { 232 {
@@ -327,7 +327,7 @@ namespace OpenSim.Framework.Data.MSSQL
327 /// <param name="handle">The attempted regionHandle of the challenger</param> 327 /// <param name="handle">The attempted regionHandle of the challenger</param>
328 /// <param name="authkey">The secret</param> 328 /// <param name="authkey">The secret</param>
329 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 329 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
330 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) 330 override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
331 { 331 {
332 bool throwHissyFit = false; // Should be true by 1.0 332 bool throwHissyFit = false; // Should be true by 1.0
333 333
@@ -358,7 +358,7 @@ namespace OpenSim.Framework.Data.MSSQL
358 return false; 358 return false;
359 } 359 }
360 360
361 public ReservationData GetReservationAtPoint(uint x, uint y) 361 override public ReservationData GetReservationAtPoint(uint x, uint y)
362 { 362 {
363 return null; 363 return null;
364 } 364 }
diff --git a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
index 0cba9f0..61ab067 100644
--- a/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
+++ b/OpenSim/Framework/Data.MySQL/MySQLGridData.cs
@@ -39,7 +39,7 @@ namespace OpenSim.Framework.Data.MySQL
39 /// <summary> 39 /// <summary>
40 /// A MySQL Interface for the Grid Server 40 /// A MySQL Interface for the Grid Server
41 /// </summary> 41 /// </summary>
42 public class MySQLGridData : IGridData 42 public class MySQLGridData : GridDataBase
43 { 43 {
44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType); 44 private static readonly log4net.ILog m_log = log4net.LogManager.GetLogger(System.Reflection.MethodBase.GetCurrentMethod().DeclaringType);
45 45
@@ -51,7 +51,7 @@ namespace OpenSim.Framework.Data.MySQL
51 /// <summary> 51 /// <summary>
52 /// Initialises the Grid Interface 52 /// Initialises the Grid Interface
53 /// </summary> 53 /// </summary>
54 public void Initialise() 54 override public void Initialise()
55 { 55 {
56 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini"); 56 IniFile GridDataMySqlFile = new IniFile("mysql_connection.ini");
57 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname"); 57 string settingHostname = GridDataMySqlFile.ParseFileReadValue("hostname");
@@ -113,7 +113,7 @@ namespace OpenSim.Framework.Data.MySQL
113 /// <summary> 113 /// <summary>
114 /// Shuts down the grid interface 114 /// Shuts down the grid interface
115 /// </summary> 115 /// </summary>
116 public void Close() 116 override public void Close()
117 { 117 {
118 database.Close(); 118 database.Close();
119 } 119 }
@@ -122,7 +122,7 @@ namespace OpenSim.Framework.Data.MySQL
122 /// Returns the plugin name 122 /// Returns the plugin name
123 /// </summary> 123 /// </summary>
124 /// <returns>Plugin name</returns> 124 /// <returns>Plugin name</returns>
125 public string getName() 125 override public string getName()
126 { 126 {
127 return "MySql OpenGridData"; 127 return "MySql OpenGridData";
128 } 128 }
@@ -131,7 +131,7 @@ namespace OpenSim.Framework.Data.MySQL
131 /// Returns the plugin version 131 /// Returns the plugin version
132 /// </summary> 132 /// </summary>
133 /// <returns>Plugin version</returns> 133 /// <returns>Plugin version</returns>
134 public string getVersion() 134 override public string getVersion()
135 { 135 {
136 return "0.1"; 136 return "0.1";
137 } 137 }
@@ -144,7 +144,7 @@ namespace OpenSim.Framework.Data.MySQL
144 /// <param name="xmax">Maximum X coordinate</param> 144 /// <param name="xmax">Maximum X coordinate</param>
145 /// <param name="ymax">Maximum Y coordinate</param> 145 /// <param name="ymax">Maximum Y coordinate</param>
146 /// <returns></returns> 146 /// <returns></returns>
147 public RegionProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax) 147 override public RegionProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax)
148 { 148 {
149 try 149 try
150 { 150 {
@@ -189,7 +189,7 @@ namespace OpenSim.Framework.Data.MySQL
189 /// </summary> 189 /// </summary>
190 /// <param name="handle">Region location handle</param> 190 /// <param name="handle">Region location handle</param>
191 /// <returns>Sim profile</returns> 191 /// <returns>Sim profile</returns>
192 public RegionProfileData GetProfileByHandle(ulong handle) 192 override public RegionProfileData GetProfileByHandle(ulong handle)
193 { 193 {
194 try 194 try
195 { 195 {
@@ -221,7 +221,7 @@ namespace OpenSim.Framework.Data.MySQL
221 /// </summary> 221 /// </summary>
222 /// <param name="uuid">The region UUID</param> 222 /// <param name="uuid">The region UUID</param>
223 /// <returns>The sim profile</returns> 223 /// <returns>The sim profile</returns>
224 public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 224 override public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
225 { 225 {
226 try 226 try
227 { 227 {
@@ -253,7 +253,7 @@ namespace OpenSim.Framework.Data.MySQL
253 /// </summary> 253 /// </summary>
254 /// <param name="uuid">The region name search query</param> 254 /// <param name="uuid">The region name search query</param>
255 /// <returns>The sim profile</returns> 255 /// <returns>The sim profile</returns>
256 public RegionProfileData GetProfileByString(string regionName) 256 override public RegionProfileData GetProfileByString(string regionName)
257 { 257 {
258 if (regionName.Length > 2) 258 if (regionName.Length > 2)
259 { 259 {
@@ -294,7 +294,7 @@ namespace OpenSim.Framework.Data.MySQL
294 /// </summary> 294 /// </summary>
295 /// <param name="profile">The profile to add</param> 295 /// <param name="profile">The profile to add</param>
296 /// <returns>Successful?</returns> 296 /// <returns>Successful?</returns>
297 public DataResponse AddProfile(RegionProfileData profile) 297 override public DataResponse AddProfile(RegionProfileData profile)
298 { 298 {
299 lock (database) 299 lock (database)
300 { 300 {
@@ -337,7 +337,7 @@ namespace OpenSim.Framework.Data.MySQL
337 /// <param name="handle">The attempted regionHandle of the challenger</param> 337 /// <param name="handle">The attempted regionHandle of the challenger</param>
338 /// <param name="authkey">The secret</param> 338 /// <param name="authkey">The secret</param>
339 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 339 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
340 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) 340 override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
341 { 341 {
342 bool throwHissyFit = false; // Should be true by 1.0 342 bool throwHissyFit = false; // Should be true by 1.0
343 343
@@ -369,7 +369,7 @@ namespace OpenSim.Framework.Data.MySQL
369 return false; 369 return false;
370 } 370 }
371 371
372 public ReservationData GetReservationAtPoint(uint x, uint y) 372 override public ReservationData GetReservationAtPoint(uint x, uint y)
373 { 373 {
374 try 374 try
375 { 375 {
diff --git a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
index 397ef82..94e8e50 100644
--- a/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
+++ b/OpenSim/Framework/Data.SQLite/SQLiteGridData.cs
@@ -37,7 +37,7 @@ namespace OpenSim.Framework.Data.SQLite
37 /// <summary> 37 /// <summary>
38 /// A Grid Interface to the SQLite database 38 /// A Grid Interface to the SQLite database
39 /// </summary> 39 /// </summary>
40 public class SQLiteGridData : IGridData 40 public class SQLiteGridData : GridDataBase
41 { 41 {
42 /// <summary> 42 /// <summary>
43 /// A database manager 43 /// A database manager
@@ -47,7 +47,7 @@ namespace OpenSim.Framework.Data.SQLite
47 /// <summary> 47 /// <summary>
48 /// Initialises the Grid Interface 48 /// Initialises the Grid Interface
49 /// </summary> 49 /// </summary>
50 public void Initialise() 50 override public void Initialise()
51 { 51 {
52 database = new SQLiteManager("localhost", "db", "user", "password", "false"); 52 database = new SQLiteManager("localhost", "db", "user", "password", "false");
53 } 53 }
@@ -55,7 +55,7 @@ namespace OpenSim.Framework.Data.SQLite
55 /// <summary> 55 /// <summary>
56 /// Shuts down the grid interface 56 /// Shuts down the grid interface
57 /// </summary> 57 /// </summary>
58 public void Close() 58 override public void Close()
59 { 59 {
60 database.Close(); 60 database.Close();
61 } 61 }
@@ -64,7 +64,7 @@ namespace OpenSim.Framework.Data.SQLite
64 /// Returns the name of this grid interface 64 /// Returns the name of this grid interface
65 /// </summary> 65 /// </summary>
66 /// <returns>A string containing the grid interface</returns> 66 /// <returns>A string containing the grid interface</returns>
67 public string getName() 67 override public string getName()
68 { 68 {
69 return "SQLite OpenGridData"; 69 return "SQLite OpenGridData";
70 } 70 }
@@ -73,7 +73,7 @@ namespace OpenSim.Framework.Data.SQLite
73 /// Returns the version of this grid interface 73 /// Returns the version of this grid interface
74 /// </summary> 74 /// </summary>
75 /// <returns>A string containing the version</returns> 75 /// <returns>A string containing the version</returns>
76 public string getVersion() 76 override public string getVersion()
77 { 77 {
78 return "0.1"; 78 return "0.1";
79 } 79 }
@@ -86,7 +86,7 @@ namespace OpenSim.Framework.Data.SQLite
86 /// <param name="c">maximum X coordinate</param> 86 /// <param name="c">maximum X coordinate</param>
87 /// <param name="d">maximum Y coordinate</param> 87 /// <param name="d">maximum Y coordinate</param>
88 /// <returns>An array of region profiles</returns> 88 /// <returns>An array of region profiles</returns>
89 public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d) 89 override public RegionProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
90 { 90 {
91 return null; 91 return null;
92 } 92 }
@@ -96,7 +96,7 @@ namespace OpenSim.Framework.Data.SQLite
96 /// </summary> 96 /// </summary>
97 /// <param name="handle">Region location handle</param> 97 /// <param name="handle">Region location handle</param>
98 /// <returns>Sim profile</returns> 98 /// <returns>Sim profile</returns>
99 public RegionProfileData GetProfileByHandle(ulong handle) 99 override public RegionProfileData GetProfileByHandle(ulong handle)
100 { 100 {
101 Dictionary<string, string> param = new Dictionary<string, string>(); 101 Dictionary<string, string> param = new Dictionary<string, string>();
102 param["handle"] = handle.ToString(); 102 param["handle"] = handle.ToString();
@@ -116,7 +116,7 @@ namespace OpenSim.Framework.Data.SQLite
116 /// </summary> 116 /// </summary>
117 /// <param name="regionName">The region name search query</param> 117 /// <param name="regionName">The region name search query</param>
118 /// <returns>The sim profile</returns> 118 /// <returns>The sim profile</returns>
119 public RegionProfileData GetProfileByString(string regionName) 119 override public RegionProfileData GetProfileByString(string regionName)
120 { 120 {
121 if (regionName.Length > 2) 121 if (regionName.Length > 2)
122 { 122 {
@@ -145,7 +145,7 @@ namespace OpenSim.Framework.Data.SQLite
145 /// </summary> 145 /// </summary>
146 /// <param name="uuid">The region UUID</param> 146 /// <param name="uuid">The region UUID</param>
147 /// <returns>The sim profile</returns> 147 /// <returns>The sim profile</returns>
148 public RegionProfileData GetProfileByLLUUID(LLUUID uuid) 148 override public RegionProfileData GetProfileByLLUUID(LLUUID uuid)
149 { 149 {
150 Dictionary<string, string> param = new Dictionary<string, string>(); 150 Dictionary<string, string> param = new Dictionary<string, string>();
151 param["uuid"] = uuid.ToString(); 151 param["uuid"] = uuid.ToString();
@@ -175,7 +175,7 @@ namespace OpenSim.Framework.Data.SQLite
175 /// </summary> 175 /// </summary>
176 /// <param name="profile">The profile to add</param> 176 /// <param name="profile">The profile to add</param>
177 /// <returns>A dataresponse enum indicating success</returns> 177 /// <returns>A dataresponse enum indicating success</returns>
178 public DataResponse AddProfile(RegionProfileData profile) 178 override public DataResponse AddProfile(RegionProfileData profile)
179 { 179 {
180 if (database.insertRow(profile)) 180 if (database.insertRow(profile))
181 { 181 {
@@ -194,7 +194,7 @@ namespace OpenSim.Framework.Data.SQLite
194 /// <param name="handle">The attempted regionHandle of the challenger</param> 194 /// <param name="handle">The attempted regionHandle of the challenger</param>
195 /// <param name="authkey">The secret</param> 195 /// <param name="authkey">The secret</param>
196 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns> 196 /// <returns>Whether the secret and regionhandle match the database entry for UUID</returns>
197 public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey) 197 override public bool AuthenticateSim(LLUUID uuid, ulong handle, string authkey)
198 { 198 {
199 bool throwHissyFit = false; // Should be true by 1.0 199 bool throwHissyFit = false; // Should be true by 1.0
200 200
@@ -226,7 +226,7 @@ namespace OpenSim.Framework.Data.SQLite
226 return false; 226 return false;
227 } 227 }
228 228
229 public ReservationData GetReservationAtPoint(uint x, uint y) 229 override public ReservationData GetReservationAtPoint(uint x, uint y)
230 { 230 {
231 return null; 231 return null;
232 } 232 }
diff --git a/OpenSim/Framework/Data/GridDataBase.cs b/OpenSim/Framework/Data/GridDataBase.cs
index e7333b4..32a729a 100644
--- a/OpenSim/Framework/Data/GridDataBase.cs
+++ b/OpenSim/Framework/Data/GridDataBase.cs
@@ -1,10 +1,22 @@
1using System; 1using System;
2using System.Collections.Generic; 2using System.Collections.Generic;
3using System.Text; 3using System.Text;
4using libsecondlife;
4 5
5namespace OpenSim.Framework.Data 6namespace OpenSim.Framework.Data
6{ 7{
7 public abstract class GridDataBase 8 public abstract class GridDataBase : IGridData
8 { 9 {
10 public abstract RegionProfileData GetProfileByHandle(ulong regionHandle);
11 public abstract RegionProfileData GetProfileByLLUUID(LLUUID UUID);
12 public abstract RegionProfileData GetProfileByString(string regionName);
13 public abstract RegionProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
14 public abstract bool AuthenticateSim(LLUUID UUID, ulong regionHandle, string simrecvkey);
15 public abstract void Initialise();
16 public abstract void Close();
17 public abstract string getName();
18 public abstract string getVersion();
19 public abstract DataResponse AddProfile(RegionProfileData profile);
20 public abstract ReservationData GetReservationAtPoint(uint x, uint y);
9 } 21 }
10} 22}