factor out parameter parsing into its own class

[nominatim.git] / utils / query.php

diff --git a/utils/query.php b/utils/query.php
index 919486adc340503051d10a9d0cdfdb8ab086c7bd..a3f51f74604632b5a80f15b47b20ac8439690f90 100755 (executable)
--- a/utils/query.php
+++ b/utils/query.php
@@ -4,6 +4,7 @@
        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(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');

        ini_set('memory_limit', '800M');
 
        $aCMDOptions = array(
        ini_set('memory_limit', '800M');
 
        $aCMDOptions = array(


@@ -12,45 +13,43 @@
                array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
                array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
 
                array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
                array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
 

-        array('search', '', 0, 1, 1, 1, 'string', 'Search for given term or coordinate'),
-
-        array('accept-language', '', 0, 1, 1, 1, 'string', 'Preferred language order for showing search results'),
-        array('bounded', '', 0, 1, 0, 0, 'bool', 'Restrict results to given viewbox'),
-        array('nodedupe', '', 0, 1, 0, 0, 'bool', 'Do not remove duplicate results'),
-        array('limit', '', 0, 1, 1, 1, 'int', 'Maximum number of results returned (default: 10)'),
-        array('exclude_place_ids', '', 0, 1, 1, 1, 'string', 'Comma-separated list of place ids to exclude from results'),
-        array('featureType', '', 0, 1, 1, 1, 'string', 'Restrict results to certain features (country, state,city,settlement)'),
-        array('countrycodes', '', 0, 1, 1, 1, 'string', 'Comma-separated list of countries to restrict search to'),
-        array('viewbox', '', 0, 1, 1, 1, 'string', 'Prefer results in given view box')
-    );
-    getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
-
-    $oDB =& getDB();
-
-    if (isset($aCMDResult['search']) && $aCMDResult['search'])
-    {
-        if (isset($aCMDResult['bounded'])) $aCMDResult['bounded'] = 'true';
-        if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false';
-
-        $oGeocode = new Geocode($oDB);
-        if (isset($aCMDResult['accept-language']) && $aCMDResult['accept-language'])
-            $oGeocode->setLanguagePreference(getPreferredLanguages($aCMDResult['accept-language']));
-        else
-            $oGeocode->setLanguagePreference(getPreferredLanguages());
-        $oGeocode->loadParamArray($aCMDResult);
-        $oGeocode->setQuery($aCMDResult['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";
-    }
-    else
-    {
-        showUsage($aCMDOptions, true);
-    }
-    
+               array('search', '', 0, 1, 1, 1, 'string', 'Search for given term or coordinate'),
+
+               array('accept-language', '', 0, 1, 1, 1, 'string', 'Preferred language order for showing search results'),
+               array('bounded', '', 0, 1, 0, 0, 'bool', 'Restrict results to given viewbox'),
+               array('nodedupe', '', 0, 1, 0, 0, 'bool', 'Do not remove duplicate results'),
+               array('limit', '', 0, 1, 1, 1, 'int', 'Maximum number of results returned (default: 10)'),
+               array('exclude_place_ids', '', 0, 1, 1, 1, 'string', 'Comma-separated list of place ids to exclude from results'),
+               array('featureType', '', 0, 1, 1, 1, 'string', 'Restrict results to certain features (country, state,city,settlement)'),
+               array('countrycodes', '', 0, 1, 1, 1, 'string', 'Comma-separated list of countries to restrict search to'),
+               array('viewbox', '', 0, 1, 1, 1, 'string', 'Prefer results in given view box')
+       );
+       getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
+
+       $oDB =& getDB();
+       $oParams = new ParameterParser($aCMDResult);
+
+       if ($oParams->getBool('search'))
+       {
+               if (isset($aCMDResult['nodedupe'])) $aCMDResult['dedupe'] = 'false';
+
+               $oGeocode = new Geocode($oDB);
+
+               $oGeocode->setLanguagePreference($oParams->getPreferredLanguages(false));
+               $oGeocode->loadParamArray($oParams);
+               $oGeocode->setQuery($aCMDResult['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";
+       }
+       else
+       {
+               showUsage($aCMDOptions, true);
+       }
+