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

Patch for OpenSearch.cs and query.php to make Events show up, no working buttons yet

Browse Source 
git-svn-id: http://forge.opensimulator.org/svn/ossearch/trunk@86 109abde3-1f22-4c10-b5d7-b6b0135cd00c
This commit is contained in:
fly-man-
2008-10-26 01:22:44 +00:00
parent 9d1b14aaa3
commit 5a3f9b8a74
2 changed files with 115 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files
patches/OpenSearch.patch
+33 -5
View File
@@ -1,16 +1,44 @@
Index: trunk/OpenSimSearch/Modules/SearchModule/OpenSearch.cs
Index: OpenSearch.cs
===================================================================
--- trunk/OpenSimSearch/Modules/SearchModule/OpenSearch.cs (revision 83)
+++ trunk/OpenSimSearch/Modules/SearchModule/OpenSearch.cs (working copy)
--- OpenSearch.cs (revision 85)
+++ OpenSearch.cs (working copy)
@@ -102,6 +102,7 @@
client.OnDirClassifiedQuery += DirClassifiedQuery;
// Response after Directory Queries
client.OnEventInfoRequest += EventInfoRequest;
+ client.OnEventLocationRequest += EventLocationRequest;
+ //client.OnEventLocationRequest += EventLocationRequest;
}
@@ -501,5 +502,20 @@
@@ -485,21 +486,35 @@
Hashtable d = (Hashtable)dataArray[0];
EventData data = new EventData();
data.eventID = Convert.ToUInt32(d["event_id"]);
- data.creator = d["Creator"].ToString();
- data.name = d["Name"].ToString();
- data.category = d["Category"].ToString();
- data.description = d["Description"].ToString();
- data.date = DateTime.ParseExact(d["Date"].ToString(),
- "yyyy-MM-dd T", DateTimeFormatInfo.InvariantInfo);
- data.dateUTC = Convert.ToUInt32(d["DateUTC"]);
- data.duration = Convert.ToUInt32(d["Duration"]);
- data.cover = Convert.ToUInt32(d["Cover"]);
- data.amount = Convert.ToUInt32(d["Amount"]);
- data.simName = d["SimName"].ToString();
- Vector3.TryParse(d["GlobalPos"].ToString(), out data.globalPos);
- data.eventFlags = Convert.ToUInt32(d["EventFlags"]);
+ data.creator = d["creator"].ToString();
+ data.name = d["name"].ToString();
+ data.category = d["category"].ToString();
+ data.description = d["description"].ToString();
+ data.date = d["date"].ToString();
+ data.dateUTC = Convert.ToUInt32(d["dateUTC"]);
+ data.duration = Convert.ToUInt32(d["duration"]);
+ data.cover = Convert.ToUInt32(d["covercharge"]);
+ data.amount = Convert.ToUInt32(d["coveramount"]);
+ data.simName = d["simname"].ToString();
+ Vector3.TryParse(d["globalposition"].ToString(), out data.globalPos);
+ data.eventFlags = Convert.ToUInt32(d["eventflags"]);
remoteClient.SendEventInfoReply(data);
}
patches/Query.patch
+82 -23
View File
@@ -1,24 +1,56 @@
Index: trunk/webroot/query.php
Index: query.php
===================================================================
--- trunk/webroot/query.php (revision 83)
+++ trunk/webroot/query.php (working copy)
@@ -244,12 +244,14 @@
--- query.php (revision 85)
+++ query.php (working copy)
@@ -244,13 +244,15 @@
$data = array();
while (($row = mysql_fetch_assoc($result)))
{
+ $row["Date"] = strftime("%m/%d %I:%M %p",$row["DateUTC"]);
+ $date = strftime("%m/%d %I:%M %p",$row["dateUTC"]);
+
$data[] = array(
"owner_id" => $row["OwnerID"],
"name" => $row["Name"],
"event_id" => $row["EventID"],
"date" => $row["Date"],
- "owner_id" => $row["OwnerID"],
- "name" => $row["Name"],
- "event_id" => $row["EventID"],
- "date" => $row["Date"],
- "unix_time" => $row["UnixTime"],
+ "unix_time" => $row["DateUTC"],
"event_flags" => $row["EventFlags"]);
- "event_flags" => $row["EventFlags"]);
+ "owner_id" => $row["owneruuid"],
+ "name" => $row["name"],
+ "event_id" => $row["eventid"],
+ "date" => $date,
+ "unix_time" => $row["dateUTC"],
+ "event_flags" => $row["eventflags"]);
}
@@ -274,12 +276,12 @@
$response_xml = xmlrpc_encode(array(
@@ -268,18 +270,38 @@
{
$req = $params[0];
+ $text = $req['text'];
+ $flags = $req['flags'];
+ $category = $req['category'];
+ $query_start = $req['query_start'];
+
+ if ($text == "%%%")
+ {
+ $response_xml = xmlrpc_encode(array(
+ 'success' => False,
+ 'errorMessage' => "Invalid search terms"
+ ));
+
+ print $response_xml;
+
+ return;
+ }
+
+ $sql = "select * from classifieds". $where.
+ " limit " . mysql_escape_string($query_start) . ",101";
+
$result = mysql_query($sql);
$data = array();
while (($row = mysql_fetch_assoc($result)))
{
$data[] = array(
@@ -28,21 +60,48 @@ Index: trunk/webroot/query.php
- "CreationDate" => $row["CreationDate"],
- "ExpirationDate" => $row["ExpirationDate"],
- "PriceForListing" => $row["PriceForListing"]);
+ "classifiedid" => $row["ClassifiedID"],
+ "name" => $row["Name"],
+ "classifiedFlags" => $row["ClassifiedFlags"],
+ "creationdate" => $row["CreationDate"],
+ "expirationdate" => $row["ExpirationDate"],
+ "priceforlisting" => $row["PriceForListing"]);
+ "classifiedid" => $row["classifieduuid"],
+ "name" => $row["name"],
+ "classifiedflags" => $row["classifiedflags"],
+ "creationdate" => $row["creationdate"],
+ "expirationdate" => $row["expirationdate"],
+ "priceforlisting" => $row["priceforlisting"]);
}
$response_xml = xmlrpc_encode(array(
@@ -310,7 +312,7 @@
@@ -309,20 +331,22 @@
$data = array();
while (($row = mysql_fetch_assoc($result)))
{
+ $date = strftime("%G-%m-%d %H:%M:%S",$row["dateUTC"]);
+
$data[] = array(
- "event_id" => $row["eventID"],
+ "event_id" => $row["EventID"],
"creator" => $row["Creator"],
"name" => $row["Name"],
"category" => $row["Category"],
- "creator" => $row["Creator"],
- "name" => $row["Name"],
- "category" => $row["Category"],
- "description" => $row["Desc"],
- "date" => $row["Date"],
- "dateUTC" => $row["DateUTC"],
- "duration" => $row["Duration"],
- "covercharge" => $row["Cover"],
- "coveramount" => $row["Amount"],
- "simName" => $row["SimName"],
- "globalposition" => $row["GlobalPos"],
- "eventflags" => $row["EventFlags"]);
+ "event_id" => $row["eventid"],
+ "creator" => $row["creatoruuid"],
+ "name" => $row["name"],
+ "category" => $row["category"],
+ "description" => $row["description"],
+ "date" => $date,
+ "dateUTC" => $row["dateUTC"],
+ "duration" => $row["duration"],
+ "covercharge" => $row["covercharge"],
+ "coveramount" => $row["coveramount"],
+ "simname" => $row["simname"],
+ "globalposition" => $row["globalPos"],
+ "eventflags" => $row["eventflags"]);
}
$response_xml = xmlrpc_encode(array(