factor out parameter parsing into its own class

[nominatim.git] / website / lookup.php

diff --git a/website/lookup.php b/website/lookup.php
index 5fc6c309ad2b955ddfc3dadf0a0bc286a0e35376..0129f21748a4f03d0dd55e58c638d96d611e28b1 100755 (executable)
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -6,15 +6,17 @@
        require_once(CONST_BasePath.'/lib/log.php');
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/output.php');
        require_once(CONST_BasePath.'/lib/log.php');
        require_once(CONST_BasePath.'/lib/PlaceLookup.php');
        require_once(CONST_BasePath.'/lib/output.php');

-
-       $oDB =& getDB();

        ini_set('memory_limit', '200M');
 
        ini_set('memory_limit', '200M');
 

+       $oParams = new ParameterParser();
+

        // Format for output
        // Format for output

-       $sOutputFormat = getParamSet('format', array('xml', 'json'), 'xml');
+       $sOutputFormat = $oParams->getSet('format', array('xml', 'json'), 'xml');

 
        // Preferred language
 
        // Preferred language

-       $aLangPrefOrder = getPreferredLanguages();
+       $aLangPrefOrder = $oParams->getPreferredLanguages();
+
+       $oDB =& getDB();

 
        $hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 
 
        $hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
 


@@ -23,11 +25,11 @@
 
        $oPlaceLookup = new PlaceLookup($oDB);
        $oPlaceLookup->setLanguagePreference($aLangPrefOrder);
 
        $oPlaceLookup = new PlaceLookup($oDB);
        $oPlaceLookup->setLanguagePreference($aLangPrefOrder);

-       $oPlaceLookup->setIncludeAddressDetails(getParamBool('addressdetails', true));
-       $oPlaceLookup->setIncludeExtraTags(getParamBool('extratags', false));
-       $oPlaceLookup->setIncludeNameDetails(getParamBool('namedetails', false));
+       $oPlaceLookup->setIncludeAddressDetails($oParams->getBool('addressdetails', true));
+       $oPlaceLookup->setIncludeExtraTags($oParams->getBool('extratags', false));
+       $oPlaceLookup->setIncludeNameDetails($oParams->getBool('namedetails', false));

 
 

-       $aOsmIds = explode(',', getParamString('osm_ids', ''));
+       $aOsmIds = explode(',', $oParams->getString('osm_ids', ''));

 
        if (count($aOsmIds) > CONST_Places_Max_ID_count)
        {
 
        if (count($aOsmIds) > CONST_Places_Max_ID_count)
        {