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

OpenSimSearch/Modules/SearchModule/OpenSearch.cs

Browse Source 
- Added support for Event mapitem queries

webroot/query.php
- Fixed parsing of search string and handling of UTC offset
- Include region and landing point in returned data


git-svn-id: http://forge.opensimulator.org/svn/ossearch/trunk@176 109abde3-1f22-4c10-b5d7-b6b0135cd00c
This commit is contained in:
kcozens
2011-11-30 01:21:35 +00:00
parent 4cbbd3c94c
commit 369eddcb54
2 changed files with 113 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
OpenSimSearch/Modules/SearchModule/OpenSearch.cs
+103
View File
@@ -352,6 +352,7 @@ namespace OpenSimSearch.Modules.OpenSearch
remoteClient.SendDirPeopleReply(queryID, data);
}
public void DirEventsQuery(IClientAPI remoteClient, UUID queryID,
string queryText, uint queryFlags, int queryStart)
{
@@ -636,6 +637,108 @@ namespace OpenSimSearch.Modules.OpenSearch
remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
mapitems.Clear();
}
if (itemtype == (uint)OpenMetaverse.GridItemType.PgEvent ||
itemtype == (uint)OpenMetaverse.GridItemType.MatureEvent ||
itemtype == (uint)OpenMetaverse.GridItemType.AdultEvent)
{
Hashtable ReqHash = new Hashtable();
//Find the maturity level
int maturity = (1 << 24);
//Find the maturity level
if (itemtype == (uint)OpenMetaverse.GridItemType.MatureEvent)
maturity = (1 << 25);
else
{
if (itemtype == (uint)OpenMetaverse.GridItemType.AdultEvent)
maturity = (1 << 26);
}
//The flags are: SortAsc (1 << 15), PerMeterSort (1 << 17)
maturity |= 163840;
//Character before | is number of days before/after current date
//Characters after | is the number for a category
ReqHash["text"] = "0|0";
ReqHash["flags"] = maturity.ToString();
ReqHash["query_start"] = "0";
Hashtable result = GenericXMLRPCRequest(ReqHash,
"dir_events_query");
if (!Convert.ToBoolean(result["success"]))
{
remoteClient.SendAgentAlertMessage(
result["errorMessage"].ToString(), false);
return;
}
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];
foreach (Object o in dataArray)
{
Hashtable d = (Hashtable)o;
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();
if (++i >= count)
break;
}
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])
{
locX = scene.RegionInfo.RegionLocX;
locY = scene.RegionInfo.RegionLocY;
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;
mapitems.Add(mapitem);
i++;
}
remoteClient.SendMapItemReply(mapitems.ToArray(), itemtype, flags);
mapitems.Clear();
}
}
}
}
webroot/query.php
+10 -5
View File
@@ -314,10 +314,13 @@ function dir_events_query($method_name, $params, $app_data)
$day = $pieces[0];
$category = $pieces[1];
$search_text= $pieces[2];
if (count($pieces) < 3)
$search_text = "";
else
$search_text = $pieces[2];
//Get todays date/time and adjust it to UTC
$now = time() - date_offset_get();
$now = time() - date_offset_get(new DateTime);
$terms = array();
@@ -333,7 +336,7 @@ function dir_events_query($method_name, $params, $app_data)
$terms[] = "(dateUTC > ".$now." AND dateUTC <= ".$then.")";
}
if ($category <> 0)
if ($category != 0)
$terms[] = "category = ".$category."";
$type = array();
@@ -377,7 +380,9 @@ function dir_events_query($method_name, $params, $app_data)
"event_id" => $row["eventid"],
"date" => $date,
"unix_time" => $row["dateUTC"],
"event_flags" => $row["eventflags"]);
"event_flags" => $row["eventflags"],
"landing_point" => $row["globalPos"],
"region_UUID" => $row["simname"]);
}
$response_xml = xmlrpc_encode(array(
@@ -428,7 +433,7 @@ function dir_classified_query ($method_name, $params, $app_data)
if (count($terms) > 0)
$terms[] = join_terms(" OR ", $terms, True);
if ($category <> 0)
if ($category != 0)
$terms[] = "category = ".$category."";
if ($text != "")