Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / status.php

diff --git a/website/status.php b/website/status.php
index b40f135227c8d9b277f85d065be1a3d7f09e3608..b30a9a403d7580efaf78a06b4603717ea0998c40 100644 (file)
--- a/website/status.php
+++ b/website/status.php
@@ -4,6 +4,7 @@
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 

+

 function statusError($sMsg)
 {
     header("HTTP/1.0 500 Internal Server Error");
 function statusError($sMsg)
 {
     header("HTTP/1.0 500 Internal Server Error");


@@ -12,31 +13,25 @@ function statusError($sMsg)
 }
 
 $oDB =& DB::connect(CONST_Database_DSN, false);
 }
 
 $oDB =& DB::connect(CONST_Database_DSN, false);

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

     statusError("No database");
 }
 
 $sStandardWord = $oDB->getOne("select make_standard_name('a')");
     statusError("No database");
 }
 
 $sStandardWord = $oDB->getOne("select make_standard_name('a')");

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

     statusError("Module failed");
 }
     statusError("Module failed");
 }

-if ($sStandardWord != 'a')
-{
+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')");
     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))
-{
+if (PEAR::isError($iWordID)) {

     statusError("Query failed");
 }
     statusError("Query failed");
 }

-if (!$iWordID)
-{
+if (!$iWordID) {

     statusError("No value");
 }
 
 echo "OK";
 exit;
     statusError("No value");
 }
 
 echo "OK";
 exit;

-