Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / query.php

diff --git a/utils/query.php b/utils/query.php
old mode 100755 (executable)
new mode 100644 (file)
index 05875d6..f8047ff
--- a/utils/query.php
+++ b/utils/query.php
@@ -1,7 +1,5 @@
-#!/usr/bin/php -Cq
 <?php
 
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
 require_once(CONST_BasePath.'/lib/Geocode.php');
 require_once(CONST_BasePath.'/lib/ParameterParser.php');
@@ -9,7 +7,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'),
@@ -27,13 +25,15 @@ $aCMDOptions
   );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
-$oDB =& getDB();
-$oParams = new ParameterParser($aCMDResult);
+$oDB = new Nominatim\DB;
+$oDB->connect();
+
+$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,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);
 }