hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

need phrase types in getGroupedSearches

Browse Source
This commit is contained in:
Sarah Hoffmann
2015-01-26 21:34:21 +01:00
parent f6bfadaef6
commit b121da0ca3
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Geocode.php
View File

@@ -441,7 +441,7 @@
return $aSearchResults; return $aSearchResults;
} }
function getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases) function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
{ {
/* /*
Calculate all searches using aValidTokens i.e. Calculate all searches using aValidTokens i.e.
@@ -1039,7 +1039,7 @@
// Start the search process // Start the search process
$aResultPlaceIDs = array(); $aResultPlaceIDs = array();
$aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases); $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases);
if ($this->bReverseInPlan) if ($this->bReverseInPlan)
{ {
@@ -1053,7 +1053,7 @@
$aFinalPhrase = end($aPhrases); $aFinalPhrase = end($aPhrases);
$aFinalPhrase['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0); $aFinalPhrase['wordsets'] = getInverseWordSets($aFinalPhrase['words'], 0);
} }
$aReverseGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, false); $aReverseGroupedSearches = $this->getGroupedSearches($aSearches, null, $aPhrases, $aValidTokens, $aWordFrequencyScores, false);
foreach($aGroupedSearches as $aSearches) foreach($aGroupedSearches as $aSearches)
{ {