safety-screen/Nominatim
1
0
Fork 0
forked from hans/Nominatim
Code Pull Requests Activity

Merge pull request #2314 from lonvia/fix-status-no-import-date

Browse Source 
Correctly catch the exception when import date is missing
This commit is contained in:
Sarah Hoffmann
2021-05-06 17:41:53 +02:00
committed by GitHub
parent 2ae293aeb6 d8ead78e03
commit 40cb17d299
2 changed files with 18 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib-php/Status.php
View File

@@ -37,7 +37,7 @@ class Status
$iDataDateEpoch = $this->oDB->getOne($sSQL); $iDataDateEpoch = $this->oDB->getOne($sSQL);
if ($iDataDateEpoch === false) { if ($iDataDateEpoch === false) {
throw Exception('Data date query failed '.$iDataDateEpoch->getMessage(), 705); throw new Exception('Import date is not available', 705);
} }
return $iDataDateEpoch; return $iDataDateEpoch;

38
lib-php/website/status.php
View File

@@ -17,6 +17,23 @@ if ($sOutputFormat == 'json') {
try { try {
$oStatus = new Nominatim\Status($oDB); $oStatus = new Nominatim\Status($oDB);
$oStatus->status(); $oStatus->status();
if ($sOutputFormat == 'json') {
$epoch = $oStatus->dataDate();
$aResponse = array(
'status' => 0,
'message' => 'OK',
'data_updated' => (new DateTime('@'.$epoch))->format(DateTime::RFC3339),
'software_version' => CONST_NominatimVersion
);
$sDatabaseVersion = $oStatus->databaseVersion();
if ($sDatabaseVersion) {
$aResponse['database_version'] = $sDatabaseVersion;
}
javascript_renderData($aResponse);
} else {
echo 'OK';
}
} catch (Exception $oErr) { } catch (Exception $oErr) {
if ($sOutputFormat == 'json') { if ($sOutputFormat == 'json') {
$aResponse = array( $aResponse = array(
@@ -28,25 +45,4 @@ try {
header('HTTP/1.0 500 Internal Server Error'); header('HTTP/1.0 500 Internal Server Error');
echo 'ERROR: '.$oErr->getMessage(); 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),
'software_version' => CONST_NominatimVersion
);
$sDatabaseVersion = $oStatus->databaseVersion();
if ($sDatabaseVersion) {
$aResponse['database_version'] = $sDatabaseVersion;
}
javascript_renderData($aResponse);
} else {
echo 'OK';
}
exit;