edited indices an setup file to grant select for table country_osm_grid

[nominatim.git] / lib / Phrase.php

diff --git a/lib/Phrase.php b/lib/Phrase.php
index 0fe1d3132ce6f8346fa7fdac77ced5379e877f3b..7cf3f29736d0f7cee944581b558a8bc2658d02cd 100644 (file)
--- a/lib/Phrase.php
+++ b/lib/Phrase.php
@@ -9,7 +9,7 @@ namespace Nominatim;
  */
 class Phrase
 {
  */
 class Phrase
 {

-    CONST MAX_DEPTH = 7;
+    const MAX_DEPTH = 7;

 
     // Complete phrase as a string.
     private $sPhrase;
 
     // Complete phrase as a string.
     private $sPhrase;


@@ -83,7 +83,7 @@ class Phrase
         $aResult = array(array(join(' ', $aWords)));
         $sFirstToken = '';
         if ($iDepth < Phrase::MAX_DEPTH) {
         $aResult = array(array(join(' ', $aWords)));
         $sFirstToken = '';
         if ($iDepth < Phrase::MAX_DEPTH) {

-            while (sizeof($aWords) > 1) {
+            while (count($aWords) > 1) {

                 $sWord = array_shift($aWords);
                 $sFirstToken .= ($sFirstToken?' ':'').$sWord;
                 $aRest = $this->createWordSets($aWords, $iDepth + 1);
                 $sWord = array_shift($aWords);
                 $sFirstToken .= ($sFirstToken?' ':'').$sWord;
                 $aRest = $this->createWordSets($aWords, $iDepth + 1);


@@ -101,7 +101,7 @@ class Phrase
         $aResult = array(array(join(' ', $aWords)));
         $sFirstToken = '';
         if ($iDepth < Phrase::MAX_DEPTH) {
         $aResult = array(array(join(' ', $aWords)));
         $sFirstToken = '';
         if ($iDepth < Phrase::MAX_DEPTH) {

-            while (sizeof($aWords) > 1) {
+            while (count($aWords) > 1) {

                 $sWord = array_pop($aWords);
                 $sFirstToken = $sWord.($sFirstToken?' ':'').$sFirstToken;
                 $aRest = $this->createInverseWordSets($aWords, $iDepth + 1);
                 $sWord = array_pop($aWords);
                 $sFirstToken = $sWord.($sFirstToken?' ':'').$sFirstToken;
                 $aRest = $this->createInverseWordSets($aWords, $iDepth + 1);


@@ -113,4 +113,14 @@ class Phrase
 
         return $aResult;
     }
 
         return $aResult;
     }

-};
+
+    public function debugInfo()
+    {
+        return array(
+                'Type' => $this->sPhraseType,
+                'Phrase' => $this->sPhrase,
+                'Words' => $this->aWords,
+                'WordSets' => $this->aWordSets
+               );
+    }
+}