X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/38874233816367831c5c30cea0db16d48a3d7016..513bf485f20f0308c7f25c96717190a354bf0ec3:/utils/query.php?ds=sidebyside diff --git a/utils/query.php b/utils/query.php index 05875d64..53ce176c 100755 --- a/utils/query.php +++ b/utils/query.php @@ -9,7 +9,7 @@ ini_set('memory_limit', '800M'); $aCMDOptions = array( - "Query database from command line. Returns search result as JSON.", + 'Query database from command line. Returns search result as JSON.', array('help', 'h', 0, 1, 0, 0, false, 'Show Help'), array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'), array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'), @@ -28,12 +28,12 @@ $aCMDOptions getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true); $oDB =& getDB(); -$oParams = new ParameterParser($aCMDResult); +$oParams = new Nominatim\ParameterParser($aCMDResult); if ($oParams->getBool('search')) { if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false'; - $oGeocode = new Geocode($oDB); + $oGeocode = new Nominatim\Geocode($oDB); $oGeocode->setLanguagePreference($oParams->getPreferredLanguages(false)); $oGeocode->loadParamArray($oParams); @@ -41,7 +41,7 @@ if ($oParams->getBool('search')) { $aSearchResults = $oGeocode->lookup(); - if (version_compare(phpversion(), "5.4.0", '<')) { + 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";