X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3d8d52632b20b96e2236330c49c88a33c999e72f..a2f1dd1c3111363e22c90a5dedff0f990a8d172f:/website/search.php?ds=sidebyside

diff --git a/website/search.php b/website/search.php
index e00d8791..70b51e10 100755
--- a/website/search.php
+++ b/website/search.php
@@ -163,7 +163,10 @@
 	}
 	if (sizeof($aStructuredQuery) > 0) {
 		$sQuery = join(', ', $aStructuredQuery);
-		$sAllowedTypesSQLList = '(\'place\',\'boundary\')';
+		if ($iMaxAddressRank < 30)
+		{
+			$sAllowedTypesSQLList = '(\'place\',\'boundary\')';
+		}
 	}
 
 	if ($sQuery)
@@ -805,6 +808,10 @@
 					{
 						$iQueryLoop++;
 
+						if (CONST_Debug) { echo "<hr><b>Search Loop, group $iGroupLoop, loop $iQueryLoop</b>"; }
+						if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);	
+
+
 						// Must have a location term
 						if (!sizeof($aSearch['aName']) && !sizeof($aSearch['aAddress']) && !$aSearch['fLon'])
 						{
@@ -815,6 +822,7 @@
 									$sSQL = "select place_id from placex where country_code='".$aSearch['sCountryCode']."' and rank_search = 4";
 									if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";								
 									$sSQL .= " order by st_area(geometry) desc limit 1";
+									if (CONST_Debug) var_dump($sSQL);
 									$aPlaceIDs = $oDB->getCol($sSQL);
 								}
 							}
@@ -822,8 +830,6 @@
 							{
 								if (!$bBoundingBoxSearch && !$aSearch['fLon']) continue;
 								if (!$aSearch['sClass']) continue;
-								if (CONST_Debug) var_dump('<hr>',$aSearch);
-								if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);	
 								$sSQL = "select count(*) from pg_tables where tablename = 'place_classtype_".$aSearch['sClass']."_".$aSearch['sType']."'";
 								if ($oDB->getOne($sSQL))
 								{
@@ -869,8 +875,6 @@
 						}
 						else
 						{
-							if (CONST_Debug) var_dump('<hr>',$aSearch);
-							if (CONST_Debug) _debugDumpGroupedSearches(array($iGroupedRank => array($aSearch)), $aValidTokens);	
 							$aPlaceIDs = array();
 
 							// First we need a position, either aName or fLat or both
@@ -1126,7 +1130,7 @@
 							failInternalError("Could not get place IDs from tokens." ,$sSQL, $aPlaceIDs);
 						}
 
-						if (CONST_Debug) var_Dump($aPlaceIDs);
+						if (CONST_Debug) { echo "<br><b>Place IDs:</b> "; var_Dump($aPlaceIDs); }
 
 						foreach($aPlaceIDs as $iPlaceID)
 						{
@@ -1140,7 +1144,7 @@
 					if ($iGroupLoop > 4) break;
 					if ($iQueryLoop > 30) break;
 				}
-//exit;
+
 				// Did we find anything?	
 				if (isset($aResultPlaceIDs) && sizeof($aResultPlaceIDs))
 				{
@@ -1196,7 +1200,7 @@
 					$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
 					$sSQL .= "order by importance desc";
 //					$sSQL .= "order by rank_search,rank_address,porder asc";
-					if (CONST_Debug) var_dump('<hr>',$sSQL);
+					if (CONST_Debug) { echo "<hr>"; var_dump($sSQL); }
 					$aSearchResults = $oDB->getAll($sSQL);
 //var_dump($sSQL,$aSearchResults);exit;
 
@@ -1264,7 +1268,7 @@
 					$sSQL .= ",get_address_by_language(place_id, $sLanguagePrefArraySQL) ";
 					$sSQL .= "order by importance desc";
 //					$sSQL .= "order by rank_search,rank_address,porder asc";
-					if (CONST_Debug) var_dump('<hr>',$sSQL);
+					if (CONST_Debug) { echo "<hr>", var_dump($sSQL); }
 					$aSearchResults = $oDB->getAll($sSQL);
 //var_dump($sSQL,$aSearchResults);exit;