X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/fae8da2bcb78d6020231b42a5a3f2444b64755eb..9905bbf733542af5f0ac1e3d827fbb353b446beb:/utils/query.php diff --git a/utils/query.php b/utils/query.php index 16657daf..f8047ffc 100644 --- a/utils/query.php +++ b/utils/query.php @@ -25,7 +25,9 @@ $aCMDOptions ); getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true); -$oDB =& getDB(); +$oDB = new Nominatim\DB; +$oDB->connect(); + $oParams = new Nominatim\ParameterParser($aCMDResult); if ($oParams->getBool('search')) { @@ -39,11 +41,7 @@ if ($oParams->getBool('search')) { $aSearchResults = $oGeocode->lookup(); - if (version_compare(phpversion(), '5.4.0', '<')) { - echo json_encode($aSearchResults); - } else { - echo json_encode($aSearchResults, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)."\n"; - } + echo json_encode($aSearchResults, JSON_PRETTY_PRINT | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE)."\n"; } else { showUsage($aCMDOptions, true); }