cleanup get_addressdata

[nominatim.git] / lib / TokenList.php

diff --git a/lib/TokenList.php b/lib/TokenList.php
index 67d94edd7ded9efa1c598b67d3d90eadc3972aba..1b6a1dcf37f7629667d6a388d4052ff81cc3e1ed 100644 (file)
--- a/lib/TokenList.php
+++ b/lib/TokenList.php
@@ -55,6 +55,18 @@ class TokenList
         return isset($this->aTokens[$sWord]);
     }
 
         return isset($this->aTokens[$sWord]);
     }
 

+    /**
+     * Check if there are partial or full tokens for the given word.
+     *
+     * @param string $sWord Token word to look for.
+     *
+     * @return bool True if there is one or more token for the token word.
+     */
+    public function containsAny($sWord)
+    {
+        return isset($this->aTokens[$sWord]) || isset($this->aTokens[' '.$sWord]);
+    }
+

     /**
      * Get the list of tokens for the given token word.
      *
     /**
      * Get the list of tokens for the given token word.
      *


@@ -68,10 +80,25 @@ 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.
      *

-     * @param object   $oDB           Database connection.
+     * @param object   $oDB           Nominatim::DB instance.

      * @param string[] $aTokens       List of tokens to look up in the database.
      * @param string[] $aCountryCodes List of country restrictions.
      * @param string   $sNormQuery    Normalized query string.
      * @param string[] $aTokens       List of tokens to look up in the database.
      * @param string[] $aCountryCodes List of country restrictions.
      * @param string   $sNormQuery    Normalized query string.


@@ -85,11 +112,11 @@ class TokenList
         $sSQL = 'SELECT word_id, word_token, word, class, type, country_code,';
         $sSQL .= ' operator, coalesce(search_name_count, 0) as count';
         $sSQL .= ' FROM word WHERE word_token in (';
         $sSQL = 'SELECT word_id, word_token, word, class, type, country_code,';
         $sSQL .= ' operator, coalesce(search_name_count, 0) as count';
         $sSQL .= ' FROM word WHERE word_token in (';

-        $sSQL .= join(',', array_map('getDBQuoted', $aTokens)).')';
+        $sSQL .= join(',', $oDB->getDBQuotedList($aTokens)).')';

 
         Debug::printSQL($sSQL);
 
 
         Debug::printSQL($sSQL);
 

-        $aDBWords = chksql($oDB->getAll($sSQL), 'Could not get word tokens.');
+        $aDBWords = $oDB->getAll($sSQL, null, 'Could not get word tokens.');

 
         foreach ($aDBWords as $aWord) {
             $oToken = null;
 
         foreach ($aDBWords as $aWord) {
             $oToken = null;


@@ -138,8 +165,9 @@ class TokenList
             } else {
                 $oToken = new Token\Word(
                     $iId,
             } else {
                 $oToken = new Token\Word(
                     $iId,

-                    $aWord['word'][0] != ' ',
-                    (int) $aWord['count']
+                    $aWord['word_token'][0] != ' ',
+                    (int) $aWord['count'],
+                    substr_count($aWord['word_token'], ' ')

                 );
             }
 
                 );
             }