admin/OpenSimSearch
1
0
Fork 0
mirror of https://github.com/kcozens/OpenSimSearch.git synced 2026-08-14 08:52:28 +00:00
Code Issues Packages Projects Releases Wiki Activity

Changed handling of results for LandForSale and events in MapItemRequests()

Browse Source 
and DirLandQuery() to avoid triggering an exception if region name is null.
(Problem spotted by Snoopy2 on #opensim-dev)


git-svn-id: http://forge.opensimulator.org/svn/ossearch/trunk@185 109abde3-1f22-4c10-b5d7-b6b0135cd00c
This commit is contained in:
kcozens
2012-02-02 07:23:24 +00:00
parent ff51796212
commit e2eb4f5fc4
1 changed files with 49 additions and 77 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenSimSearch/Modules/SearchModule/OpenSearch.cs
+49 -77
View File
@@ -308,8 +308,18 @@ namespace OpenSimSearch.Modules.OpenSearch
}
ArrayList dataArray = (ArrayList)result["data"];
int count = 0;
/* Count entries in dataArray with valid region name to */
/* prevent allocating data array with too many entries. */
foreach (Object o in dataArray)
{
Hashtable d = (Hashtable)o;
if (d["name"] != null)
++count;
}
int count = dataArray.Count;
if (count > 100)
count = 101;
@@ -365,6 +375,7 @@ namespace OpenSimSearch.Modules.OpenSearch
new DirPeopleReplyData[accounts.Count];
int i = 0;
foreach (UserAccount item in accounts)
{
data[i] = new DirPeopleReplyData();
@@ -608,11 +619,9 @@ namespace OpenSimSearch.Modules.OpenSearch
if (count > 100)
count = 101;
DirLandReplyData[] Landdata = new DirLandReplyData[count];
int i = 0;
string[] ParcelLandingPoint = new string[count];
string[] ParcelRegionUUID = new string[count];
List<mapItemReply> mapitems = new List<mapItemReply>();
string ParcelRegionUUID;
string[] landingpoint;
foreach (Object o in dataArray)
{
@@ -621,47 +630,32 @@ namespace OpenSimSearch.Modules.OpenSearch
if (d["name"] == null)
continue;
Landdata[i] = new DirLandReplyData();
Landdata[i].parcelID = new UUID(d["parcel_id"].ToString());
Landdata[i].name = d["name"].ToString();
Landdata[i].auction = Convert.ToBoolean(d["auction"]);
Landdata[i].forSale = Convert.ToBoolean(d["for_sale"]);
Landdata[i].salePrice = Convert.ToInt32(d["sale_price"]);
Landdata[i].actualArea = Convert.ToInt32(d["area"]);
ParcelLandingPoint[i] = d["landing_point"].ToString();
ParcelRegionUUID[i] = d["region_UUID"].ToString();
mapItemReply mapitem = new mapItemReply();
if (++i >= count)
break;
}
ParcelRegionUUID = d["region_UUID"].ToString();
List<mapItemReply> mapitems = new List<mapItemReply>();
uint locX = 0;
uint locY = 0;
i = 0;
foreach (DirLandReplyData landDir in Landdata)
{
foreach (Scene scene in m_Scenes)
{
if (scene.RegionInfo.RegionID.ToString() == ParcelRegionUUID[i])
if (scene.RegionInfo.RegionID.ToString() == ParcelRegionUUID)
{
locX = scene.RegionInfo.RegionLocX;
locY = scene.RegionInfo.RegionLocY;
landingpoint = d["landing_point"].ToString().Split('/');
mapitem.x = (uint)((scene.RegionInfo.RegionLocX * 256) +
Convert.ToDecimal(landingpoint[0]));
mapitem.y = (uint)((scene.RegionInfo.RegionLocY * 256) +
Convert.ToDecimal(landingpoint[1]));
break;
}
}
string[] landingpoint = ParcelLandingPoint[i].Split('/');
mapItemReply mapitem = new mapItemReply();
mapitem.x = (uint)((locX * 256) + Convert.ToDecimal(landingpoint[0]));
mapitem.y = (uint)((locY * 256) + Convert.ToDecimal(landingpoint[1]));
mapitem.id = landDir.parcelID;
mapitem.name = landDir.name;
mapitem.Extra = landDir.actualArea;
mapitem.Extra2 = landDir.salePrice;
mapitem.id = new UUID(d["parcel_id"].ToString());
mapitem.Extra = Convert.ToInt32(d["area"]);
mapitem.Extra2 = Convert.ToInt32(d["sale_price"]);
mapitem.name = d["name"].ToString();
mapitems.Add(mapitem);
i++;
}
remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
mapitems.Clear();
}
@@ -705,15 +699,9 @@ namespace OpenSimSearch.Modules.OpenSearch
ArrayList dataArray = (ArrayList)result["data"];
int count = dataArray.Count;
if (count > 100)
count = 101;
DirEventsReplyData[] Eventsdata = new DirEventsReplyData[count];
int i = 0;
string[] ParcelLandingPoint = new string[count];
string[] ParcelRegionUUID = new string[count];
List<mapItemReply> mapitems = new List<mapItemReply>();
string ParcelRegionUUID;
string[] landingpoint;
foreach (Object o in dataArray)
{
@@ -722,48 +710,32 @@ namespace OpenSimSearch.Modules.OpenSearch
if (d["name"] == null)
continue;
Eventsdata[i] = new DirEventsReplyData();
Eventsdata[i].ownerID = new UUID(d["owner_id"].ToString());
Eventsdata[i].name = d["name"].ToString();
Eventsdata[i].eventID = (uint)Convert.ToInt32(d["event_id"]);
Eventsdata[i].date = d["date"].ToString();
Eventsdata[i].unixTime = (uint)Convert.ToInt32(d["unix_time"]);
Eventsdata[i].eventFlags = (uint)Convert.ToInt32(d["event_flags"]);
ParcelLandingPoint[i] = d["landing_point"].ToString();
ParcelRegionUUID[i] = d["region_UUID"].ToString();
mapItemReply mapitem = new mapItemReply();
if (++i >= count)
break;
}
ParcelRegionUUID = d["region_UUID"].ToString();
List<mapItemReply> mapitems = new List<mapItemReply>();
uint locX = 0;
uint locY = 0;
i = 0;
foreach (DirEventsReplyData Eventdata in Eventsdata)
{
foreach (Scene scene in m_Scenes)
{
if (scene.RegionInfo.RegionID.ToString() == ParcelRegionUUID[i])
if (scene.RegionInfo.RegionID.ToString() == ParcelRegionUUID)
{
locX = scene.RegionInfo.RegionLocX;
locY = scene.RegionInfo.RegionLocY;
landingpoint = d["landing_point"].ToString().Split('/');
mapitem.x = (uint)((scene.RegionInfo.RegionLocX * 256) +
Convert.ToDecimal(landingpoint[0]));
mapitem.y = (uint)((scene.RegionInfo.RegionLocY * 256) +
Convert.ToDecimal(landingpoint[1]));
break;
}
}
string[] landingpoint = ParcelLandingPoint[i].Split('/');
mapItemReply mapitem = new mapItemReply();
mapitem.x = (uint)((locX * 256) + Convert.ToDecimal(landingpoint[0]));
mapitem.y = (uint)((locY * 256) + Convert.ToDecimal(landingpoint[1]));
mapitem.id = UUID.Random();
mapitem.name = Eventdata.name;
mapitem.Extra = (int)Eventdata.unixTime;
mapitem.Extra2 = (int)Eventdata.eventID;
mapitem.Extra = (int)Convert.ToInt32(d["unix_time"]);
mapitem.Extra2 = (int)Convert.ToInt32(d["event_id"]);
mapitem.name = d["name"].ToString();
mapitems.Add(mapitem);
i++;
}
remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
mapitems.Clear();
}