website dependencies: jQuery v2.1 => 3.5, leaflet 1.3 => 1.6

[nominatim.git] / lib / TokenList.php

diff --git a/lib/TokenList.php b/lib/TokenList.php
index 2d0c7c16d0ae74e2931ba159ba9ffe3818d59085..fce5f940b84513a6bc1850cbbbdb5e9fa043682c 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.
      *


@@ -71,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.


@@ -89,7 +101,7 @@ class TokenList
 
         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;