From 3ee195b1e6ff02715c132da431152276b464eaec Mon Sep 17 00:00:00 2001
From: Adam Frisby
Date: Mon, 14 May 2007 16:13:31 +0000
Subject: * Commented out GridManager lines until they are checked into SVN *
 Added new GetProfilesInRange(x,y,x,y) data function to return sim profiles
 between certain coordinates (for use with World Map information, etc).
 Implemented in GridServer.Data.Mysql - stub functions placed in other data
 providers.

---
 OpenGrid.Framework.Data.DB4o/DB4oGridData.cs     |  5 +++
 OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs   |  5 +++
 OpenGrid.Framework.Data.MySQL/MySQLGridData.cs   | 39 +++++++++++++++++++++++-
 OpenGrid.Framework.Data.MySQL/MySQLManager.cs    |  1 -
 OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs |  5 +++
 OpenGrid.Framework.Data/GridData.cs              | 10 ++++++
 OpenGridServices.GridServer/Main.cs              |  2 +-
 7 files changed, 64 insertions(+), 3 deletions(-)

diff --git a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs b/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
index caf7eb0..546713e 100644
--- a/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
+++ b/OpenGrid.Framework.Data.DB4o/DB4oGridData.cs
@@ -15,6 +15,11 @@ namespace OpenGrid.Framework.Data.DB4o
              manager = new DB4oGridManager("gridserver.yap");
         }
 
+        public SimProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
+        {
+            return null;
+        }
+
         public SimProfileData GetProfileByHandle(ulong handle) {
             lock (manager.simProfiles)
             {
diff --git a/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs b/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
index 8a93d40..0925df1 100644
--- a/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
+++ b/OpenGrid.Framework.Data.MSSQL/MSSQLGridData.cs
@@ -35,6 +35,11 @@ namespace OpenGrid.Framework.Data.MSSQL
             return "0.1";
         }
 
+        public SimProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
+        {
+            return null;
+        }
+
         /// <summary>
         /// Returns a sim profile from it's location
         /// </summary>
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs b/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
index 3dceff6..46183b4 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
+++ b/OpenGrid.Framework.Data.MySQL/MySQLGridData.cs
@@ -14,7 +14,7 @@ namespace OpenGrid.Framework.Data.MySQL
         /// </summary>
         public void Initialise()
         {
-            database = new MySQLManager("server", "database", "username", "password", "false");
+            database = new MySQLManager("localhost", "database", "username", "password", "false");
         }
 
         /// <summary>
@@ -35,6 +35,43 @@ namespace OpenGrid.Framework.Data.MySQL
             return "0.1";
         }
 
+        public SimProfileData[] GetProfilesInRange(uint xmin, uint ymin, uint xmax, uint ymax)
+        {
+            try
+            {
+                lock (database)
+                {
+                    Dictionary<string, string> param = new Dictionary<string, string>();
+                    param["?xmin"] = xmin.ToString();
+                    param["?ymin"] = ymin.ToString();
+                    param["?xmax"] = xmax.ToString();
+                    param["?ymax"] = ymax.ToString();
+
+                    System.Data.IDbCommand result = database.Query("SELECT * FROM regions WHERE locX >= ?xmin AND locX <= ?xmax AND locY >= ?ymin AND locY <= ?ymax", param);
+                    System.Data.IDataReader reader = result.ExecuteReader();
+
+                    SimProfileData row;
+
+                    List<SimProfileData> rows = new List<SimProfileData>();
+
+                    while ((row = database.getSimRow(reader)) != null)
+                    {
+                        rows.Add(row);
+                    }
+                    reader.Close();
+                    result.Dispose();
+
+                    return rows.ToArray();
+
+                }
+            }
+            catch (Exception e)
+            {
+                Console.WriteLine(e.ToString());
+                return null;
+            }
+        }
+
         /// <summary>
         /// Returns a sim profile from it's location
         /// </summary>
diff --git a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs b/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
index 7461b14..e4622a8 100644
--- a/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
+++ b/OpenGrid.Framework.Data.MySQL/MySQLManager.cs
@@ -121,7 +121,6 @@ namespace OpenGrid.Framework.Data.MySQL
             }
             else
             {
-                throw new Exception("Unable to find region at coordinates");
                 return null;
             }
             return retval;
diff --git a/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs b/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
index 02e153f..4850f12 100644
--- a/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
+++ b/OpenGrid.Framework.Data.SQLite/SQLiteGridData.cs
@@ -35,6 +35,11 @@ namespace OpenGrid.Framework.Data.SQLite
             return "0.1";
         }
 
+        public SimProfileData[] GetProfilesInRange(uint a, uint b, uint c, uint d)
+        {
+            return null;
+        }
+
         /// <summary>
         /// Returns a sim profile from it's location
         /// </summary>
diff --git a/OpenGrid.Framework.Data/GridData.cs b/OpenGrid.Framework.Data/GridData.cs
index d5516b2..6dad37e 100644
--- a/OpenGrid.Framework.Data/GridData.cs
+++ b/OpenGrid.Framework.Data/GridData.cs
@@ -32,6 +32,16 @@ namespace OpenGrid.Framework.Data
         SimProfileData GetProfileByLLUUID(libsecondlife.LLUUID UUID);
 
         /// <summary>
+        /// Returns all profiles within the specified range
+        /// </summary>
+        /// <param name="Xmin">Minimum sim coordinate (X)</param>
+        /// <param name="Ymin">Minimum sim coordinate (Y)</param>
+        /// <param name="Xmax">Maximum sim coordinate (X)</param>
+        /// <param name="Ymin">Maximum sim coordinate (Y)</param>
+        /// <returns>An array containing all the sim profiles in the specified range</returns>
+        SimProfileData[] GetProfilesInRange(uint Xmin, uint Ymin, uint Xmax, uint Ymax);
+
+        /// <summary>
         /// Authenticates a sim by use of it's recv key. 
         /// WARNING: Insecure
         /// </summary>
diff --git a/OpenGridServices.GridServer/Main.cs b/OpenGridServices.GridServer/Main.cs
index 0c5aa3d..54db7c6 100644
--- a/OpenGridServices.GridServer/Main.cs
+++ b/OpenGridServices.GridServer/Main.cs
@@ -115,7 +115,7 @@ namespace OpenGridServices.GridServer
 
             m_console.WriteLine(OpenSim.Framework.Console.LogPriority.LOW,"Main.cs:Startup() - Starting HTTP process");
             BaseHttpServer httpServer = new BaseHttpServer(8001);
-	    GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer,"gridserver",Cfg.SimSendKey,Cfg.SimRecvKey,managercallback);
+	        //GridManagementAgent GridManagerAgent = new GridManagementAgent(httpServer,"gridserver",Cfg.SimSendKey,Cfg.SimRecvKey,managercallback);
 
             httpServer.AddXmlRPCHandler("simulator_login", m_gridManager.XmlRpcLoginToSimulatorMethod);
 
-- 
cgit v1.1