]> git.openstreetmap.org Git - nominatim.git/commitdiff
need phrase types in getGroupedSearches
authorSarah Hoffmann <lonvia@denofr.de>
Mon, 26 Jan 2015 20:34:21 +0000 (21:34 +0100)
committerSarah Hoffmann <lonvia@denofr.de>
Mon, 26 Jan 2015 20:34:21 +0000 (21:34 +0100)
lib/Geocode.php

index 1fbbd5c59250b2677b773d79d169e1269c5ce6a0..d96b6cb8e7c29dd801456bbd2187baf32abaa072 100644 (file)
                        return $aSearchResults;
                }
 
-               function getGroupedSearches($aSearches, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
+               function getGroupedSearches($aSearches, $aPhraseTypes, $aPhrases, $aValidTokens, $aWordFrequencyScores, $bStructuredPhrases)
                {
                        /*
                           Calculate all searches using aValidTokens i.e.
                                        // 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)
                                        {
                                                        $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)
                                                {