hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

correct penalty for multi-word countries

Browse Source 
Country name needs to be the final one within the wordset, not
in the final of all wordsets.
This commit is contained in:
Sarah Hoffmann
2012-10-14 16:09:12 +02:00
parent d2a74c9bd9
commit 9d7c51a813
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
website/search.php
View File

@@ -420,12 +420,12 @@
{ {
$aNewPhraseSearches = array(); $aNewPhraseSearches = array();
foreach($aPhrases[$iPhrase]['wordsets'] as $iWordset => $aWordset) foreach($aPhrases[$iPhrase]['wordsets'] as $aWordset)
{ {
$aWordsetSearches = $aSearches; $aWordsetSearches = $aSearches;
// Add all words from this wordset // Add all words from this wordset
foreach($aWordset as $sToken) foreach($aWordset as $iToken => $sToken)
{ {
//echo "<br><b>$sToken</b>"; //echo "<br><b>$sToken</b>";
$aNewWordsetSearches = array(); $aNewWordsetSearches = array();
@@ -449,7 +449,7 @@
{ {
$aSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']); $aSearch['sCountryCode'] = strtolower($aSearchTerm['country_code']);
// Country is almost always at the end of the string - increase score for finding it anywhere else (optimisation) // Country is almost always at the end of the string - increase score for finding it anywhere else (optimisation)
if ($iWordset+1 != sizeof($aPhrases[$iPhrase]['wordsets']) || $iPhrase+1 != sizeof($aPhrases)) $aSearch['iSearchRank'] += 5; if ($iToken+1 != sizeof($aWordset) || $iPhrase+1 != sizeof($aPhrases)) $aSearch['iSearchRank'] += 5;
if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch; if ($aSearch['iSearchRank'] < $iMaxRank) $aNewWordsetSearches[] = $aSearch;
} }
} }