Adjust "show regions" and "show region" robust service console output to show size

"show regions" drops the owner id column but is till present in "show region"
"show regions" name column expanded to allow for longer hg regions (probably still too short, may eventually have to truncate rather than taking up huge screen space)
bullet-2.82
Justin Clark-Casey (justincc) 2014-07-04 23:57:24 +01:00
parent dac8703949
commit 82a5d00bc8
1 changed files with 5 additions and 5 deletions

View File

@ -620,7 +620,6 @@ namespace OpenSim.Services.GridService
OutputRegionsToConsoleSummary(regions); OutputRegionsToConsoleSummary(regions);
} }
private void HandleShowRegion(string module, string[] cmd) private void HandleShowRegion(string module, string[] cmd)
{ {
if (cmd.Length != 4) if (cmd.Length != 4)
@ -679,7 +678,8 @@ namespace OpenSim.Services.GridService
ConsoleDisplayList dispList = new ConsoleDisplayList(); ConsoleDisplayList dispList = new ConsoleDisplayList();
dispList.AddRow("Region Name", r.RegionName); dispList.AddRow("Region Name", r.RegionName);
dispList.AddRow("Region ID", r.RegionID); dispList.AddRow("Region ID", r.RegionID);
dispList.AddRow("Location", string.Format("{0},{1}", r.coordX, r.coordY)); dispList.AddRow("Position", string.Format("{0},{1}", r.coordX, r.coordY));
dispList.AddRow("Size", string.Format("{0}x{1}", r.sizeX, r.sizeY));
dispList.AddRow("URI", r.Data["serverURI"]); dispList.AddRow("URI", r.Data["serverURI"]);
dispList.AddRow("Owner ID", r.Data["owner_uuid"]); dispList.AddRow("Owner ID", r.Data["owner_uuid"]);
dispList.AddRow("Flags", flags); dispList.AddRow("Flags", flags);
@ -696,10 +696,10 @@ namespace OpenSim.Services.GridService
private void OutputRegionsToConsoleSummary(List<RegionData> regions) private void OutputRegionsToConsoleSummary(List<RegionData> regions)
{ {
ConsoleDisplayTable dispTable = new ConsoleDisplayTable(); ConsoleDisplayTable dispTable = new ConsoleDisplayTable();
dispTable.AddColumn("Name", 16); dispTable.AddColumn("Name", 44);
dispTable.AddColumn("ID", 36); dispTable.AddColumn("ID", 36);
dispTable.AddColumn("Position", 11); dispTable.AddColumn("Position", 11);
dispTable.AddColumn("Owner ID", 36); dispTable.AddColumn("Size", 11);
dispTable.AddColumn("Flags", 60); dispTable.AddColumn("Flags", 60);
foreach (RegionData r in regions) foreach (RegionData r in regions)
@ -709,7 +709,7 @@ namespace OpenSim.Services.GridService
r.RegionName, r.RegionName,
r.RegionID.ToString(), r.RegionID.ToString(),
string.Format("{0},{1}", r.coordX, r.coordY), string.Format("{0},{1}", r.coordX, r.coordY),
r.Data["owner_uuid"].ToString(), string.Format("{0}x{1}", r.sizeX, r.sizeY),
flags.ToString()); flags.ToString());
} }