From: Sarah Hoffmann <lonvia@denofr.de>
Date: Fri, 18 Jan 2013 21:31:11 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~649
X-Git-Url: https://git.openstreetmap.org/nominatim.git/commitdiff_plain/3884eb7ca8e76c1a05afca16fc0cba8312102c64?hp=90656f1465ae46dd542e9e68f1ff0dc4c3d81bde

Merge remote-tracking branch 'upstream/master'
---

diff --git a/website/search.php b/website/search.php
index a92ac30a..0d398cc4 100755
--- a/website/search.php
+++ b/website/search.php
@@ -534,7 +534,12 @@
 											{
 												$aSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
 												// Country is almost always at the end of the string - increase score for finding it anywhere else (optimisation)
-												if ($iToken+1 != sizeof($aWordset) || $iPhrase+1 != sizeof($aPhrases)) $aSearch['iSearchRank'] += 5;
+												// If reverse order is enabled, it may appear at the beginning as well.
+												if (($iToken+1 != sizeof($aWordset) || $iPhrase+1 != sizeof($aPhrases)) &&
+														(!$bReverseInPlan || $iToken > 0 || $iPhrase > 0))
+												{
+													$aSearch['iSearchRank'] += 5;
+												}
 												if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
 											}
 										}
@@ -827,12 +832,19 @@
 								if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";
 								$sSQL .= " where st_contains($sViewboxSmallSQL, ct.centroid)";
 								if ($sCountryCodesSQL) $sSQL .= " and country_code in ($sCountryCodesSQL)";								
+								if (sizeof($aExcludePlaceIDs))
+								{
+									$sSQL .= " and place_id not in (".join(',',$aExcludePlaceIDs).")";
+								}
 								if ($sViewboxCentreSQL)	$sSQL .= " order by st_distance($sViewboxCentreSQL, ct.centroid) asc";
 								$sSQL .= " limit $iLimit";
 								if (CONST_Debug) var_dump($sSQL);
 								$aPlaceIDs = $oDB->getCol($sSQL);
 
-								if (!sizeof($aPlaceIDs))
+								// If excluded place IDs are given, it is fair to assume that
+								// there have been results in the small box, so no further
+								// expansion in that case.
+								if (!sizeof($aPlaceIDs) && !sizeof($aExcludePlaceIDs))
 								{
 									$sSQL = "select place_id from place_classtype_".$aSearch['sClass']."_".$aSearch['sType']." ct";
 									if ($sCountryCodesSQL) $sSQL .= " join placex using (place_id)";