X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/fca2d0061780c5e7fb8b11a9fa2b618137b3cc8e..eb79e655e638a4345a130ceef6b0d31a1ab5b1f9:/website/status.php

diff --git a/website/status.php b/website/status.php
index 0caa92a0..b30a9a40 100644
--- a/website/status.php
+++ b/website/status.php
@@ -1,26 +1,37 @@
 <?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;
-	}
 
-	$iWordID = $oDB->getOne("select word_id,word_token, word, class, type, location, 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;
+function statusError($sMsg)
+{
+    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)) {
+    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;