Merge pull request #1692 from mtmail/tests-for-HasSetAny

[nominatim.git] / lib / TokenList.php

diff --git a/lib/TokenList.php b/lib/TokenList.php
index 96b756f8b11c4b23c901ab45182f81e1f548fe25..fce5f940b84513a6bc1850cbbbdb5e9fa043682c 100644 (file)
--- a/lib/TokenList.php
+++ b/lib/TokenList.php
@@ -32,6 +32,17 @@ class TokenList
     // List of list of tokens indexed by their word_token.
     private $aTokens = array();
 
     // List of list of tokens indexed by their word_token.
     private $aTokens = array();
 

+
+    /**
+     * Return total number of tokens.
+     *
+     * @return Integer
+     */
+    public function count()
+    {
+        return count($this->aTokens);
+    }
+

     /**
      * Check if there are tokens for the given token word.
      *
     /**
      * Check if there are tokens for the given token word.
      *


@@ -44,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.
      *


@@ -60,7 +83,7 @@ class TokenList
     /**
      * 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.


@@ -74,11 +97,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;


@@ -114,7 +137,7 @@ class TokenList
                         $iId,
                         $aWord['class'],
                         $aWord['type'],
                         $iId,
                         $aWord['class'],
                         $aWord['type'],

-                        $aWord['operator'] ? Operator::NONE : Operator::NEAR
+                        $aWord['operator'] ? Operator::NEAR : Operator::NONE

                     );
                 }
             } elseif ($aWord['country_code']) {
                     );
                 }
             } elseif ($aWord['country_code']) {


@@ -127,7 +150,7 @@ class TokenList
             } else {
                 $oToken = new Token\Word(
                     $iId,
             } else {
                 $oToken = new Token\Word(
                     $iId,

-                    $aWord['word'][0] != ' ',
+                    $aWord['word_token'][0] != ' ',

                     (int) $aWord['count']
                 );
             }
                     (int) $aWord['count']
                 );
             }