Implemented console command "show hyperlinks".

5 files changed, 111 insertions, 110 deletions

diff --git a/OpenSim/Data/IRegionData.cs b/OpenSim/Data/IRegionData.cs
index 8259f9b..9f08e04 100644
--- a/OpenSim/Data/IRegionData.cs
+++ b/OpenSim/Data/IRegionData.cs
@@ -58,10 +58,11 @@ namespace OpenSim.Data
 
         bool SetDataItem(UUID principalID, string item, string value);
 
-        bool Delete(UUID regionID);
-
+        bool Delete(UUID regionID);

+

         List<RegionData> GetDefaultRegions(UUID scopeID);
-        List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y);
+        List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y);

+        List<RegionData> GetHyperlinks(UUID scopeID);

     }
 
     [Flags]
diff --git a/OpenSim/Data/MSSQL/MSSQLRegionData.cs b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
index 66c3f81..73c67d4 100644
--- a/OpenSim/Data/MSSQL/MSSQLRegionData.cs
+++ b/OpenSim/Data/MSSQL/MSSQLRegionData.cs
@@ -306,38 +306,37 @@ namespace OpenSim.Data.MSSQL
                     return true;
             }
             return false;
-        }
+        }

 
         public List<RegionData> GetDefaultRegions(UUID scopeID)
-        {
-            string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & 1) <> 0";
-            if (scopeID != UUID.Zero)
-                sql += " AND ScopeID = @scopeID";
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                conn.Open();
-                return RunCommand(cmd);
-            }
-            
+        {

+            return Get((int)RegionFlags.DefaultRegion, scopeID);

         }
 
         public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
-        {
-            string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & 2) <> 0";
-            if (scopeID != UUID.Zero)
-                sql += " AND ScopeID = @scopeID";
-
-            using (SqlConnection conn = new SqlConnection(m_ConnectionString))
-            using (SqlCommand cmd = new SqlCommand(sql, conn))
-            {
-                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));
-                conn.Open();
-                // TODO: distance-sort results
-                return RunCommand(cmd);
-            }
-        }
+        {

+            // TODO: distance-sort results

+            return Get((int)RegionFlags.FallbackRegion, scopeID);

+        }

+

+        public List<RegionData> GetHyperlinks(UUID scopeID)

+        {

+            return Get((int)RegionFlags.Hyperlink, scopeID);

+        }

+

+        private List<RegionData> Get(int regionFlags, UUID scopeID)

+        {

+            string sql = "SELECT * FROM [" + m_Realm + "] WHERE (flags & " + regionFlags.ToString() + ") <> 0";

+            if (scopeID != UUID.Zero)

+                sql += " AND ScopeID = @scopeID";

+

+            using (SqlConnection conn = new SqlConnection(m_ConnectionString))

+            using (SqlCommand cmd = new SqlCommand(sql, conn))

+            {

+                cmd.Parameters.Add(m_database.CreateParameter("@scopeID", scopeID));

+                conn.Open();

+                return RunCommand(cmd);

+            }

+        }

     }
 }
diff --git a/OpenSim/Data/MySQL/MySQLRegionData.cs b/OpenSim/Data/MySQL/MySQLRegionData.cs
index c7bddac..6dc62c6 100644
--- a/OpenSim/Data/MySQL/MySQLRegionData.cs
+++ b/OpenSim/Data/MySQL/MySQLRegionData.cs
@@ -280,32 +280,35 @@ namespace OpenSim.Data.MySQL
             }
 
             return false;
-        }
+        }

+

         public List<RegionData> GetDefaultRegions(UUID scopeID)
-        {
-            string command = "select * from `"+m_Realm+"` where (flags & 1) <> 0";
-            if (scopeID != UUID.Zero)
-                command += " and ScopeID = ?scopeID";
-
-            MySqlCommand cmd = new MySqlCommand(command);
-
-            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
-
-            return RunCommand(cmd);
+        {

+            return Get((int)RegionFlags.DefaultRegion, scopeID);

         }
 
         public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
-        {
-            string command = "select * from `"+m_Realm+"` where (flags & 2) <> 0";
-            if (scopeID != UUID.Zero)
-                command += " and ScopeID = ?scopeID";
-
-            MySqlCommand cmd = new MySqlCommand(command);
-
-            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());
-
-            // TODO: distance-sort results
-            return RunCommand(cmd);
-        }
+        {

+            // TODO: distance-sort results

+            return Get((int)RegionFlags.FallbackRegion, scopeID);
+        }

+

+        public List<RegionData> GetHyperlinks(UUID scopeID)

+        {

+            return Get((int)RegionFlags.Hyperlink, scopeID);

+        }

+

+        private List<RegionData> Get(int regionFlags, UUID scopeID)

+        {

+            string command = "select * from `" + m_Realm + "` where (flags & " + regionFlags.ToString() + ") <> 0";

+            if (scopeID != UUID.Zero)

+                command += " and ScopeID = ?scopeID";

+

+            MySqlCommand cmd = new MySqlCommand(command);

+

+            cmd.Parameters.AddWithValue("?scopeID", scopeID.ToString());

+

+            return RunCommand(cmd);

+        }

     }
 }
diff --git a/OpenSim/Data/Null/NullRegionData.cs b/OpenSim/Data/Null/NullRegionData.cs
index d596698..397b32d 100644
--- a/OpenSim/Data/Null/NullRegionData.cs
+++ b/OpenSim/Data/Null/NullRegionData.cs
@@ -49,8 +49,8 @@ namespace OpenSim.Data.Null
             if (Instance == null)
                 Instance = this;
             //Console.WriteLine("[XXX] NullRegionData constructor");
-        }
-
+        }

+

         public List<RegionData> Get(string regionName, UUID scopeID)
         {
             if (Instance != this)
@@ -160,38 +160,37 @@ namespace OpenSim.Data.Null
             m_regionData.Remove(regionID);
 
             return true;
-        }
-
+        }

+

         public List<RegionData> GetDefaultRegions(UUID scopeID)
-        {
-            if (Instance != this)
-                return Instance.GetDefaultRegions(scopeID);
-
-            List<RegionData> ret = new List<RegionData>();
-
-            foreach (RegionData r in m_regionData.Values)
-            {
-                if ((Convert.ToInt32(r.Data["flags"]) & 1) != 0)
-                    ret.Add(r);
-            }
-
-            return ret;
+        {

+            return Get((int)RegionFlags.DefaultRegion, scopeID);
         }
 
         public List<RegionData> GetFallbackRegions(UUID scopeID, int x, int y)
-        {
-            if (Instance != this)
-                return Instance.GetFallbackRegions(scopeID, x, y);
-
-            List<RegionData> ret = new List<RegionData>();
-
-            foreach (RegionData r in m_regionData.Values)
-            {
-                if ((Convert.ToInt32(r.Data["flags"]) & 2) != 0)
-                    ret.Add(r);
-            }
-
-            return ret;
-        }
+        {

+            return Get((int)RegionFlags.FallbackRegion, scopeID);

+        }

+

+        public List<RegionData> GetHyperlinks(UUID scopeID)

+        {

+            return Get((int)RegionFlags.Hyperlink, scopeID);

+        }

+

+        private List<RegionData> Get(int regionFlags, UUID scopeID)

+        {

+            if (Instance != this)

+                return Instance.Get(regionFlags, scopeID);

+

+            List<RegionData> ret = new List<RegionData>();

+

+            foreach (RegionData r in m_regionData.Values)

+            {

+                if ((Convert.ToInt32(r.Data["flags"]) & regionFlags) != 0)

+                    ret.Add(r);

+            }

+

+            return ret;

+        }

     }
 }
\ No newline at end of file
diff --git a/OpenSim/Services/GridService/HypergridLinker.cs b/OpenSim/Services/GridService/HypergridLinker.cs
index ae80a8c..23f0004 100644
--- a/OpenSim/Services/GridService/HypergridLinker.cs
+++ b/OpenSim/Services/GridService/HypergridLinker.cs
@@ -378,32 +378,31 @@ namespace OpenSim.Services.GridService
 
         public void HandleShow(string module, string[] cmd)
         {
-            MainConsole.Instance.Output("Not Implemented Yet");
-            //if (cmd.Length != 2)
-            //{
-            //    MainConsole.Instance.Output("Syntax: show hyperlinks");
-            //    return;
-            //}
-            //List<GridRegion> regions = new List<GridRegion>(m_HypergridService.m_HyperlinkRegions.Values);
-            //if (regions == null || regions.Count < 1)
-            //{
-            //    MainConsole.Instance.Output("No hyperlinks");
-            //    return;
-            //}
-
-            //MainConsole.Instance.Output("Region Name          Region UUID");
-            //MainConsole.Instance.Output("Location             URI");
-            //MainConsole.Instance.Output("Owner ID  ");
-            //MainConsole.Instance.Output("-------------------------------------------------------------------------------");
-            //foreach (GridRegion r in regions)
-            //{
-            //    MainConsole.Instance.Output(String.Format("{0,-20} {1}\n{2,-20} {3}\n{4,-39} \n\n",
-            //            r.RegionName, r.RegionID,
-            //            String.Format("{0},{1}", r.RegionLocX, r.RegionLocY), "http://" + r.ExternalHostName + ":" + r.HttpPort.ToString(),
-            //            r.EstateOwner.ToString()));
-            //}
-            //return;
+            if (cmd.Length != 2)

+            {

+                MainConsole.Instance.Output("Syntax: show hyperlinks");

+                return;

+            }
+            List<RegionData> regions = m_Database.GetHyperlinks(UUID.Zero);

+            if (regions == null || regions.Count < 1)

+            {

+                MainConsole.Instance.Output("No hyperlinks");

+                return;

+            }

+

+            MainConsole.Instance.Output("Region Name                             Region UUID");

+            MainConsole.Instance.Output("Location                                URI");

+            MainConsole.Instance.Output("-------------------------------------------------------------------------------");

+            foreach (RegionData r in regions)

+            {

+                MainConsole.Instance.Output(String.Format("{0,-39} {1}\n{2,-39} {3}\n",

+                        r.RegionName, r.RegionID,

+                        String.Format("{0},{1} ({2},{3})", r.posX, r.posY, r.posX / 256, r.posY / 256),

+                        "http://" + r.Data["serverIP"].ToString() + ":" + r.Data["serverHttpPort"].ToString()));

+            }

+            return;
         }
+
         public void RunCommand(string module, string[] cmdparams)
         {
             List<string> args = new List<string>(cmdparams);