prepare 3.6.0 release

[nominatim.git] / lib / TokenList.php

diff --git a/lib/TokenList.php b/lib/TokenList.php
index fce5f940b84513a6bc1850cbbbdb5e9fa043682c..1b6a1dcf37f7629667d6a388d4052ff81cc3e1ed 100644 (file)
--- a/lib/TokenList.php
+++ b/lib/TokenList.php
@@ -80,6 +80,21 @@ class TokenList
         return isset($this->aTokens[$sWord]) ? $this->aTokens[$sWord] : array();
     }
 
         return isset($this->aTokens[$sWord]) ? $this->aTokens[$sWord] : array();
     }
 

+    public function getFullWordIDs()
+    {
+        $ids = array();
+
+        foreach ($this->aTokens as $aTokenList) {
+            foreach ($aTokenList as $oToken) {
+                if (is_a($oToken, '\Nominatim\Token\Word') && !$oToken->bPartial) {
+                    $ids[$oToken->iId] = $oToken->iId;
+                }
+            }
+        }
+
+        return $ids;
+    }
+

     /**
      * Add token information from the word table in the database.
      *
     /**
      * Add token information from the word table in the database.
      *


@@ -151,7 +166,8 @@ class TokenList
                 $oToken = new Token\Word(
                     $iId,
                     $aWord['word_token'][0] != ' ',
                 $oToken = new Token\Word(
                     $iId,
                     $aWord['word_token'][0] != ' ',

-                    (int) $aWord['count']
+                    (int) $aWord['count'],
+                    substr_count($aWord['word_token'], ' ')

                 );
             }
 
                 );
             }