X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/fec4c3c30189a771e177d585b8d4ad95e697fc00..3868714175831358422e11f87e4d229c9d73561d:/website/search.php

diff --git a/website/search.php b/website/search.php
index c6aa05d1..f0bcf077 100755
--- a/website/search.php
+++ b/website/search.php
@@ -163,8 +163,7 @@
 			$sViewboxSmallSQL = $oDB->getOne($sSQL);
 			if (PEAR::isError($sViewboxSmallSQL))
 			{
-				var_dump($sViewboxSmallSQL);
-				exit;
+				failInternalError("Could not get small viewbox.", $sSQL, $sViewboxSmallSQL);
 			}
 			$sViewboxSmallSQL = "'".$sViewboxSmallSQL."'::geometry";
 
@@ -172,8 +171,7 @@
 			$sViewboxLargeSQL = $oDB->getOne($sSQL);
 			if (PEAR::isError($sViewboxLargeSQL))
 			{
-				var_dump($sViewboxLargeSQL);
-				exit;
+				failInternalError("Could not get large viewbox.", $sSQL, $sViewboxLargeSQL);
 			}
 			$sViewboxLargeSQL = "'".$sViewboxLargeSQL."'::geometry";
 		}
@@ -181,21 +179,36 @@
 		// Do we have anything that looks like a lat/lon pair?
 		if (preg_match('/\\b([NS])[ ]+([0-9]+[0-9.]*)[ ]+([0-9.]+)?[, ]+([EW])[ ]+([0-9]+)[ ]+([0-9]+[0-9.]*)?\\b/', $sQuery, $aData))
 		{
-			$_GET['nearlat'] = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60);
-			$_GET['nearlon'] = ($aData[4]=='E'?1:-1) * ($aData[5] + $aData[6]/60);
-			$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
+			$fQueryLat = ($aData[1]=='N'?1:-1) * ($aData[2] + $aData[3]/60);
+			$fQueryLon = ($aData[4]=='E'?1:-1) * ($aData[5] + $aData[6]/60);
+			if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1)
+			{
+				$_GET['nearlat'] = $fQueryLat;
+				$_GET['nearlon'] = $fQueryLon;
+				$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
+			}
 		}
 		elseif (preg_match('/\\b([0-9]+)[ ]+([0-9]+[0-9.]*)?[ ]+([NS])[, ]+([0-9]+)[ ]+([0-9]+[0-9.]*)?[ ]+([EW])\\b/', $sQuery, $aData))
 		{
-			$_GET['nearlat'] = ($aData[3]=='N'?1:-1) * ($aData[1] + $aData[2]/60);
-			$_GET['nearlon'] = ($aData[6]=='E'?1:-1) * ($aData[4] + $aData[5]/60);
-			$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
+			$fQueryLat = ($aData[3]=='N'?1:-1) * ($aData[1] + $aData[2]/60);
+			$fQueryLon = ($aData[6]=='E'?1:-1) * ($aData[4] + $aData[5]/60);
+			if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1)
+			{
+				$_GET['nearlat'] = $fQueryLat;
+				$_GET['nearlon'] = $fQueryLon;
+				$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
+			}
 		}
 		elseif (preg_match('/(\\[|^|\\b)(-?[0-9]+[0-9.]*)[, ]+(-?[0-9]+[0-9.]*)(\\]|$|\\b)/', $sQuery, $aData))
 		{
-			$_GET['nearlat'] = $aData[2];
-			$_GET['nearlon'] = $aData[3];
-			$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
+			$fQueryLat = $aData[2];
+			$fQueryLon = $aData[3];
+			if ($fQueryLat <= 90.1 && $fQueryLat >= -90.1 && $fQueryLon <= 180.1 && $fQueryLon >= -180.1)
+			{
+				$_GET['nearlat'] = $fQueryLat;
+				$_GET['nearlon'] = $fQueryLon;
+				$sQuery = trim(str_replace($aData[0], ' ', $sQuery));
+			}
 		}
 
 		if ($sQuery)
@@ -297,7 +310,12 @@
 			// Check which tokens we have, get the ID numbers			
 			$sSQL = 'select word_id,word_token, word, class, type, location, country_code, operator';
 			$sSQL .= ' from word where word_token in ('.join(',',array_map("getDBQuoted",$aTokens)).')';
-			$sSQL .= ' and (class is null or class not in (\'highway\'))';
+			// HACK WARNING
+			// (mis)using search_name_count to exclude words that return too many
+			// search results. saerch_name_count is currently set to 1 by hand
+			// because there is no fast way to extract this count from a live database. 
+			$sSQL .= ' and search_name_count = 0';
+//			$sSQL .= ' and (class is null or class not in (\'highway\'))';
 //			$sSQL .= ' group by word_token, word, class, type, location, country_code';
 
 			if (CONST_Debug) var_Dump($sSQL);
@@ -309,8 +327,7 @@
 				$aDatabaseWords = array();
 			if (PEAR::IsError($aDatabaseWords))
 			{
-				var_dump($sSQL, $aDatabaseWords);
-				exit;
+				failInternalError("Could not get word tokens.", $sSQL, $aDatabaseWords);
 			}
 			$aPossibleMainWordIDs = array();
 			foreach($aDatabaseWords as $aToken)
@@ -771,12 +788,16 @@
 									$sSQL .= " limit ".$iLimit;
 
 								if (CONST_Debug) var_dump($sSQL);
+								$iStartTime = time();
 								$aViewBoxPlaceIDs = $oDB->getAll($sSQL);
 								if (PEAR::IsError($aViewBoxPlaceIDs))
 								{
-									var_dump($sSQL, $aViewBoxPlaceIDs);					
-									exit;
+									failInternalError("Could not get places for search terms.", $sSQL, $aViewBoxPlaceIDs);
 								}
+								if (time() - $iStartTime > 60) {
+									file_put_contents(CONST_BasePath.'/log/long_queries.log', date('Y-m-d H:i:s', $iStartTime).' '.$sSQL."\n", FILE_APPEND);
+								}
+
 //var_dump($aViewBoxPlaceIDs);
 								// Did we have an viewbox matches?
 								$aPlaceIDs = array();
@@ -799,7 +820,7 @@
 								$sPlaceIDs = join(',',$aPlaceIDs);
 	
 								// Now they are indexed look for a house attached to a street we found
-								$sHouseNumberRegex = '\\\\m'.str_replace(' ','[-, ]',$aSearch['sHouseNumber']).'\\\\M';						
+								$sHouseNumberRegex = '\\\\m'.str_replace(' ','[-,/ ]',$aSearch['sHouseNumber']).'\\\\M';						
 								$sSQL = "select place_id from placex where parent_place_id in (".$sPlaceIDs.") and housenumber ~* E'".$sHouseNumberRegex."'";
 								if (sizeof($aExcludePlaceIDs))
 								{
@@ -956,8 +977,7 @@
 
 						if (PEAR::IsError($aPlaceIDs))
 						{
-							var_dump($sSQL, $aPlaceIDs);					
-							exit;
+							failInternalError("Could not get place IDs from tokens." ,$sSQL, $aPlaceIDs);
 						}
 
 						if (CONST_Debug) var_Dump($aPlaceIDs);
@@ -1033,8 +1053,7 @@
 
 					if (PEAR::IsError($aSearchResults))
 					{
-						var_dump($sSQL, $aSearchResults);					
-						exit;
+						failInternalError("Could not get details for place.", $sSQL, $aSearchResults);
 					}
 				}
 			} // end if ($sQuery)
@@ -1102,8 +1121,7 @@
 
 					if (PEAR::IsError($aSearchResults))
 					{
-						var_dump($sSQL, $aSearchResults);					
-						exit;
+                        failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
 					}
 				}
 			}
@@ -1134,8 +1152,7 @@
 			$aPointPolygon = $oDB->getRow($sSQL);
 			if (PEAR::IsError($aPointPolygon))
 			{
-				var_dump($sSQL, $aPointPolygon);
-				exit;
+				failInternalError("Could not get outline.", $sSQL, $aPointPolygon);
 			}
 			if ($aPointPolygon['place_id'])
 			{