emphasize the need for valid HTTP referrer/user agent even more

[nominatim.git] / website / status.php

diff --git a/website/status.php b/website/status.php
index a7a197b89fce9ae1bfd096075c810a8651c02edf..90be93883e13a74f409f9276321e8b1c47acaf2f 100644 (file)
--- a/website/status.php
+++ b/website/status.php
@@ -1,26 +1,48 @@
 <?php
 <?php

-        @define('CONST_ConnectionBucket_PageType', 'Status');
-
-        require_once(dirname(dirname(__FILE__)).'/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, 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;

 
 

+require_once(CONST_BasePath.'/lib/init-website.php');
+require_once(CONST_BasePath.'/lib/ParameterParser.php');
+require_once(CONST_BasePath.'/lib/Status.php');
+
+$oParams = new Nominatim\ParameterParser();
+$sOutputFormat = $oParams->getSet('format', array('text', 'json'), 'text');
+
+$oDB = DB::connect(CONST_Database_DSN, false);
+$oStatus = new Nominatim\Status($oDB);
+
+
+if ($sOutputFormat == 'json') {
+    header('content-type: application/json; charset=UTF-8');
+}
+
+
+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 ($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';
+}
+
+exit;