From 16d68749a457acf079a6737f4ca9a9adb9e53e2f Mon Sep 17 00:00:00 2001
From: Homer Horwitz
Date: Fri, 3 Oct 2008 23:00:42 +0000
Subject: Add the missing bits for the new region-search: - Added lookup in the
 data-layer   - MySQL works   - SQLite doesn't have a grid-db, so it won't
 work there   - I added MSSQL-code to the best of my knowledge; but I don't
 know MSSQL :-) - Added the plumbing up to OGS1GridServices. This speaks with
 the grid-server   via XMLRPC. - Modified MapSearchModule to use the new data.
 It's backward compatible; if   used with an old grid-server, it just returns
 one found region instead of a   list. - Refactored a bit. Note: This updates
 data, grid-server and region code. No new files.

---
 OpenSim/Grid/GridServer/GridManager.cs    | 70 +++++++++++++++++++++++++++++++
 OpenSim/Grid/GridServer/GridServerBase.cs |  1 +
 2 files changed, 71 insertions(+)

(limited to 'OpenSim/Grid')

diff --git a/OpenSim/Grid/GridServer/GridManager.cs b/OpenSim/Grid/GridServer/GridManager.cs
index ed474c5..1e8ac00 100644
--- a/OpenSim/Grid/GridServer/GridManager.cs
+++ b/OpenSim/Grid/GridServer/GridManager.cs
@@ -188,6 +188,26 @@ namespace OpenSim.Grid.GridServer
             return regions;
         }
 
+        public List<RegionProfileData> GetRegions(string name, int maxNum)
+        {
+            List<RegionProfileData> regions = new List<RegionProfileData>();
+            foreach (IGridDataPlugin plugin in _plugins)
+            {
+                try
+                {
+                    int num = maxNum - regions.Count;
+                    List <RegionProfileData> profiles = plugin.GetRegionsByName(name, (uint)num);
+                    if (profiles != null) regions.AddRange(profiles);
+                }
+                catch
+                {
+                    m_log.Warn("[storage]: Unable to query regionblock via " + plugin.Name);
+                }
+            }
+
+            return regions;
+        }
+
         /// <summary>
         /// Returns a XML String containing a list of the neighbouring regions
         /// </summary>
@@ -877,6 +897,56 @@ namespace OpenSim.Grid.GridServer
         }
 
         /// <summary>
+        /// Returns up to <code>maxNumber</code> profiles of regions that have a name starting with <code>name</code>
+        /// </summary>
+        /// <param name="request"></param>
+        /// <returns></returns>
+        public XmlRpcResponse XmlRpcSearchForRegionMethod(XmlRpcRequest request)
+        {
+            Hashtable requestData = (Hashtable)request.Params[0];
+    
+            if (!requestData.ContainsKey("name") || !requestData.Contains("maxNumber"))
+            {
+                m_log.Warn("[DATA] Invalid region-search request; missing name or maxNumber");
+                return new XmlRpcResponse(500, "Missing name or maxNumber in region search request");
+            }
+            
+            Hashtable responseData = new Hashtable();
+            
+            string name = (string)requestData["name"];
+            int maxNumber = Convert.ToInt32((string)requestData["maxNumber"]);
+            if (maxNumber == 0 || name.Length < 3)
+            {
+                // either we didn't want any, or we were too unspecific
+                responseData["numFound"] = 0;
+            }
+            else
+            {
+                List<RegionProfileData> sims = GetRegions(name, maxNumber);
+
+                responseData["numFound"] = sims.Count;
+                for (int i = 0; i < sims.Count; ++i)
+                {
+                    RegionProfileData sim = sims[i];
+                    string prefix = "region" + i + ".";
+                    responseData[prefix + "region_name"] = sim.regionName;
+                    responseData[prefix + "region_UUID"] = sim.UUID.ToString();
+                    responseData[prefix + "region_locx"] = sim.regionLocX.ToString();
+                    responseData[prefix + "region_locy"] = sim.regionLocY.ToString();
+                    responseData[prefix + "sim_ip"] = sim.serverIP.ToString();
+                    responseData[prefix + "sim_port"] = sim.serverPort.ToString();
+                    responseData[prefix + "remoting_port"] = sim.remotingPort.ToString();
+                    responseData[prefix + "http_port"] = sim.httpPort.ToString();
+                    responseData[prefix + "map_UUID"] = sim.regionMapTextureID.ToString();
+                }
+            }
+
+            XmlRpcResponse response = new XmlRpcResponse();
+            response.Value = responseData;
+            return response;
+        }
+
+        /// <summary>
         /// Performs a REST Get Operation
         /// </summary>
         /// <param name="request"></param>
diff --git a/OpenSim/Grid/GridServer/GridServerBase.cs b/OpenSim/Grid/GridServer/GridServerBase.cs
index 875b4ac..2ffeb57 100644
--- a/OpenSim/Grid/GridServer/GridServerBase.cs
+++ b/OpenSim/Grid/GridServer/GridServerBase.cs
@@ -101,6 +101,7 @@ namespace OpenSim.Grid.GridServer
             m_httpServer.AddXmlRPCHandler("simulator_data_request", m_gridManager.XmlRpcSimulatorDataRequestMethod);
             m_httpServer.AddXmlRPCHandler("simulator_after_region_moved", m_gridManager.XmlRpcDeleteRegionMethod);
             m_httpServer.AddXmlRPCHandler("map_block", m_gridManager.XmlRpcMapBlockMethod);
+            m_httpServer.AddXmlRPCHandler("search_for_region_by_name", m_gridManager.XmlRpcSearchForRegionMethod);
 
             // Message Server ---> Grid Server
             m_httpServer.AddXmlRPCHandler("register_messageserver", m_gridManager.XmlRPCRegisterMessageServer);
-- 
cgit v1.1