X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/33055bcf561681a8969b3166cbed1d4aaf46ac95..57e88c1ab367a65ebec1d2b394c17ead0a70ef5b:/website/search.php?ds=sidebyside

diff --git a/website/search.php b/website/search.php
index fd91f31d..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";
 		}
@@ -329,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)
@@ -795,8 +792,7 @@
 								$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);
@@ -824,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))
 								{
@@ -981,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);
@@ -1058,8 +1053,7 @@
 
 					if (PEAR::IsError($aSearchResults))
 					{
-						var_dump($sSQL, $aSearchResults);					
-						exit;
+						failInternalError("Could not get details for place.", $sSQL, $aSearchResults);
 					}
 				}
 			} // end if ($sQuery)
@@ -1127,8 +1121,7 @@
 
 					if (PEAR::IsError($aSearchResults))
 					{
-						var_dump($sSQL, $aSearchResults);					
-						exit;
+                        failInternalError("Could not get details for place (near).", $sSQL, $aSearchResults);
 					}
 				}
 			}
@@ -1159,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'])
 			{