adapt test results to new ranking

[nominatim.git] / lib / Status.php

diff --git a/lib/Status.php b/lib/Status.php
index 86f5cac344dcd4f4d12103a7fd13375625dab73f..a276c4d5faa2c8ffe6d2bb672a5085c384ddd393 100644 (file)
--- a/lib/Status.php
+++ b/lib/Status.php
@@ -3,7 +3,6 @@
 namespace Nominatim;
 
 use Exception;
 namespace Nominatim;
 
 use Exception;

-use PEAR;

 
 class Status
 {
 
 class Status
 {


@@ -16,12 +15,18 @@ class Status
 
     public function status()
     {
 
     public function status()
     {

-        if (!$this->oDB || PEAR::isError($this->oDB)) {
+        if (!$this->oDB) {

             throw new Exception('No database', 700);
         }
 
             throw new Exception('No database', 700);
         }
 

+        try {
+            $this->oDB->connect();
+        } catch (\Nominatim\DatabaseError $e) {
+            throw new Exception('Database connection failed', 700);
+        }
+

         $sStandardWord = $this->oDB->getOne("SELECT make_standard_name('a')");
         $sStandardWord = $this->oDB->getOne("SELECT make_standard_name('a')");

-        if (PEAR::isError($sStandardWord)) {
+        if ($sStandardWord === false) {

             throw new Exception('Module failed', 701);
         }
 
             throw new Exception('Module failed', 701);
         }
 


@@ -32,7 +37,7 @@ class Status
         $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);
         $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 (PEAR::isError($iWordID)) {
+        if ($iWordID === false) {

             throw new Exception('Query failed', 703);
         }
         if (!$iWordID) {
             throw new Exception('Query failed', 703);
         }
         if (!$iWordID) {


@@ -45,7 +50,7 @@ class Status
         $sSQL = 'SELECT EXTRACT(EPOCH FROM lastimportdate) FROM import_status LIMIT 1';
         $iDataDateEpoch = $this->oDB->getOne($sSQL);
 
         $sSQL = 'SELECT EXTRACT(EPOCH FROM lastimportdate) FROM import_status LIMIT 1';
         $iDataDateEpoch = $this->oDB->getOne($sSQL);
 

-        if (PEAR::isError($iDataDateEpoch)) {
+        if ($iDataDateEpoch === false) {

             throw Exception('Data date query failed '.$iDataDateEpoch->getMessage(), 705);
         }
 
             throw Exception('Data date query failed '.$iDataDateEpoch->getMessage(), 705);
         }