X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6a7e0d652b1d40a397e1c1386d500101796676c4..d55fc392759f6f2ed2d39dfe94890a4ae0d4f0b7:/lib-php/Status.php diff --git a/lib-php/Status.php b/lib-php/Status.php index a276c4d5..52abfcd0 100644 --- a/lib-php/Status.php +++ b/lib-php/Status.php @@ -2,6 +2,8 @@ namespace Nominatim; +require_once(CONST_TokenizerDir.'/tokenizer.php'); + use Exception; class Status @@ -25,24 +27,8 @@ class Status throw new Exception('Database connection failed', 700); } - $sStandardWord = $this->oDB->getOne("SELECT make_standard_name('a')"); - if ($sStandardWord === false) { - throw new Exception('Module failed', 701); - } - - if ($sStandardWord != 'a') { - throw new Exception('Module call failed', 702); - } - - $sSQL = 'SELECT word_id, word_token, word, class, type, country_code, '; - $sSQL .= "operator, search_name_count FROM word WHERE word_token IN (' a')"; - $iWordID = $this->oDB->getOne($sSQL); - if ($iWordID === false) { - throw new Exception('Query failed', 703); - } - if (!$iWordID) { - throw new Exception('No value', 704); - } + $oTokenizer = new \Nominatim\Tokenizer($this->oDB); + $oTokenizer->checkStatus(); } public function dataDate() @@ -56,4 +42,10 @@ class Status return $iDataDateEpoch; } + + public function databaseVersion() + { + $sSQL = 'SELECT value FROM nominatim_properties WHERE property = \'database_version\''; + return $this->oDB->getOne($sSQL); + } }