X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/e929399d4dd23fa1571dd77cf489ef51d716f5cc..c47d1f4900bd156ec28643e450248233a0241329:/website/reverse.php

diff --git a/website/reverse.php b/website/reverse.php
old mode 100755
new mode 100644
index 5f9268c6..e1a1b672
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -1,7 +1,5 @@
 <?php
-@define('CONST_ConnectionBucket_PageType', 'Reverse');
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-website.php');
 require_once(CONST_BasePath.'/lib/log.php');
 require_once(CONST_BasePath.'/lib/PlaceLookup.php');
@@ -13,11 +11,13 @@ $oParams = new Nominatim\ParameterParser();
 
 // Format for output
 $sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'xml');
+set_exception_handler_by_format($sOutputFormat);
 
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 
-$oDB =& getDB();
+$oDB = new Nominatim\DB();
+$oDB->connect();
 
 $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
@@ -67,7 +67,7 @@ if (isset($aPlace)) {
     $aPlace = array();
 }
 
-logEnd($oDB, $hLog, sizeof($aPlace)?1:0);
+logEnd($oDB, $hLog, count($aPlace) ? 1 : 0);
 
 if (CONST_Debug) {
     var_dump($aPlace);