Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / status.php

diff --git a/website/status.php b/website/status.php
index b40f135227c8d9b277f85d065be1a3d7f09e3608..90be93883e13a74f409f9276321e8b1c47acaf2f 100644 (file)
--- a/website/status.php
+++ b/website/status.php
@@ -1,42 +1,48 @@
 <?php
-@define('CONST_ConnectionBucket_PageType', 'Status');
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
+require_once(CONST_BasePath.'/lib/ParameterParser.php');
+require_once(CONST_BasePath.'/lib/Status.php');
 
-function statusError($sMsg)
-{
-    header("HTTP/1.0 500 Internal Server Error");
-    echo "ERROR: ".$sMsg;
-    exit;
-}
+$oParams = new Nominatim\ParameterParser();
+$sOutputFormat = $oParams->getSet('format', array('text', 'json'), 'text');
 
-$oDB =& DB::connect(CONST_Database_DSN, false);
-if (!$oDB || PEAR::isError($oDB))
-{
-    statusError("No database");
-}
+$oDB = DB::connect(CONST_Database_DSN, false);
+$oStatus = new Nominatim\Status($oDB);
 
-$sStandardWord = $oDB->getOne("select make_standard_name('a')");
-if (PEAR::isError($sStandardWord))
-{
-    statusError("Module failed");
-}
-if ($sStandardWord != 'a')
-{
-    statusError("Module call failed");
+
+if ($sOutputFormat == 'json') {
+    header('content-type: application/json; charset=UTF-8');
 }
 
-$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");
+
+try {
+    $oStatus->status();
+} catch (Exception $oErr) {
+    if ($sOutputFormat == 'json') {
+        $aResponse = array(
+                      'status' => $oErr->getCode(),
+                      'message' => $oErr->getMessage()
+                     );
+        javascript_renderData($aResponse);
+    } else {
+        header('HTTP/1.0 500 Internal Server Error');
+        echo 'ERROR: '.$oErr->getMessage();
+    }
+    exit;
 }
-if (!$iWordID)
-{
-    statusError("No value");
+
+
+if ($sOutputFormat == 'json') {
+    $epoch = $oStatus->dataDate();
+    $aResponse = array(
+                  'status' => 0,
+                  'message' => 'OK',
+                  'data_updated' => (new DateTime('@'.$epoch))->format(DateTime::RFC3339)
+                 );
+    javascript_renderData($aResponse);
+} else {
+    echo 'OK';
 }
 
-echo "OK";
 exit;
-