X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/f56cae42913606ca9893983e3b62199a7f68b8b9..033b9590bdf562a21a45b85e9cfaefee0db754e1:/website/status.php

diff --git a/website/status.php b/website/status.php
index a826c5f0..f4e696a4 100644
--- a/website/status.php
+++ b/website/status.php
@@ -1,38 +1,42 @@
 <?php
 	@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))
+	function statusError($sMsg)
 	{
-		echo "ERROR: No database";
+		header("HTTP/1.0 500 Internal Server Error");
+		echo "ERROR: ".$sMsg;
 		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))
 	{
-		echo "ERROR: Module failed";
-		exit;
+		statusError("Module failed");
 	}
 	if ($sStandardWord != 'a')
 	{
-		echo "ERROR: Transliteration failed";
-		exit;
+		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))
 	{
-		echo "ERROR: Query failed";
-		exit;
+		statusError("Query failed");
 	}
 	if (!$iWordID)
 	{
-		echo "ERROR: No value";
-		exit;
+		statusError("No value");
 	}
+
 	echo "OK";
 	exit;