From b121da0ca35c2ff08ecd5a02dd4eb5d4a9dcc3b1 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Mon, 26 Jan 2015 21:34:21 +0100 Subject: [PATCH] need phrase types in getGroupedSearches --- lib/Geocode.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/Geocode.php b/lib/Geocode.php index 1fbbd5c5..d96b6cb8 100644 --- a/lib/Geocode.php +++ b/lib/Geocode.php @@ -441,7 +441,7 @@ return $aSearchResults; } - function getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases) + function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases) { /* Calculate all searches using aValidTokens i.e. @@ -1039,7 +1039,7 @@ // Start the search process $aResultPlaceIDs = array(); - $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases); + $aGroupedSearches = $this->getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases); if ($this->bReverseInPlan) { @@ -1053,7 +1053,7 @@ $aFinalPhrase = end($aPhrases); $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) { -- 2.45.2