Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / status.php

diff --git a/website/status.php b/website/status.php
index a826c5f03301c12b852f3ca6a73fe60447b31672..b30a9a403d7580efaf78a06b4603717ea0998c40 100644 (file)
--- a/website/status.php
+++ b/website/status.php
@@ -1,38 +1,37 @@
 <?php
 <?php

-       @define('CONST_ConnectionBucket_PageType', 'Status');
+@define('CONST_ConnectionBucket_PageType', 'Status');

 
 

-       require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+require_once(CONST_BasePath.'/lib/init-website.php');

 
 

-       $oDB =& getDB();
-       if (!$oDB || PEAR::isError($oDB))
-       {
-               echo "ERROR: No database";
-               exit;
-       }

 
 

-       $sStandardWord = $oDB->getOne("select make_standard_name('a')");
-       if (PEAR::isError($sStandardWord))
-       {
-               echo "ERROR: Module failed";
-               exit;
-       }
-       if ($sStandardWord != 'a')
-       {
-               echo "ERROR: Transliteration failed";
-               exit;
-       }
+function statusError($sMsg)
+{
+    header("HTTP/1.0 500 Internal Server Error");
+    echo "ERROR: ".$sMsg;
+    exit;
+}

 
 

-       $iWordID = $oDB->getOne("select word_id,word_token, word, class, type, country_code, operator, search_name_count from word where word_token in (' a')");
-       if (PEAR::isError($iWordID))
-       {
-               echo "ERROR: Query failed";
-               exit;
-       }
-       if (!$iWordID)
-       {
-               echo "ERROR: No value";
-               exit;
-       }
-       echo "OK";
-       exit;
+$oDB =& DB::connect(CONST_Database_DSN, false);
+if (!$oDB || PEAR::isError($oDB)) {
+    statusError("No database");
+}

 
 

+$sStandardWord = $oDB->getOne("select make_standard_name('a')");
+if (PEAR::isError($sStandardWord)) {
+    statusError("Module failed");
+}
+if ($sStandardWord != 'a') {
+    statusError("Module call failed");
+}
+
+$iWordID = $oDB->getOne("select word_id,word_token, word, class, type, country_code, operator, search_name_count from word where word_token in (' a')");
+if (PEAR::isError($iWordID)) {
+    statusError("Query failed");
+}
+if (!$iWordID) {
+    statusError("No value");
+}
+
+echo "OK";
+exit;