Mercurial > hg > batmud > maputils
changeset 1010:8e720b2f1bc1
Fix OpenSearch query code.
author | Matti Hamalainen <ccr@tnsp.org> |
---|---|
date | Fri, 18 Jun 2010 13:36:41 +0000 |
parents | 0cb5434733c9 |
children | 7e5905d738d8 |
files | www/query.php |
diffstat | 1 files changed, 4 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/www/query.php Fri Jun 18 13:24:13 2010 +0000 +++ b/www/query.php Fri Jun 18 13:36:41 2010 +0000 @@ -43,12 +43,11 @@ if ($locOpenSearch) { header("Content-Type: application/json; charset=".$pageCharset); $locResult = array(); - reset($locTable); foreach ($locTable as $data) { $match = FALSE; foreach ($data["names"] as $n) { - if (preg_match($locRegEx, $n)) { - $locResult[$n] = $data; + if (preg_match($locRegEx, $n["name"])) { + $locResult[$n["name"]] = $data; $match = TRUE; } } @@ -85,7 +84,7 @@ $locFound = TRUE; else { foreach ($data["names"] as $n) { - if (preg_match($locRegEx, $n)) + if (preg_match($locRegEx, $n["name"])) $locFound = TRUE; } } @@ -96,7 +95,7 @@ // Set result if ($locFound) { - header("Location: ".$pageMapURL.$locData["continent"].".". + echo("Location: ".$pageMapURL.$locData["continent"].".". ($locJSMap ? "htm" : "html"). "#loc".$locData["x"]."_".$locData["y"]); } else