factor out parameter parsing into its own class

[nominatim.git] / website / details.php

diff --git a/website/details.php b/website/details.php
index 10cd07e148676465faf67f19ed74c6a9d97e209a..10490097cdd29de857b78bc1a089da04c992bbf9 100755 (executable)
--- a/website/details.php
+++ b/website/details.php
@@ -5,19 +5,20 @@
        require_once(CONST_BasePath.'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
        require_once(CONST_BasePath.'/lib/output.php');
        require_once(CONST_BasePath.'/lib/init-website.php');
        require_once(CONST_BasePath.'/lib/log.php');
        require_once(CONST_BasePath.'/lib/output.php');

+       ini_set('memory_limit', '200M');
+
+       $oParams = new ParameterParser();

 
        $sOutputFormat = 'html';
 
        $sOutputFormat = 'html';

+       $aLangPrefOrder = $oParams->getPreferredLanguages();
+       $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";

 
 

-       ini_set('memory_limit', '200M');
+       $sPlaceId = $oParams->getString('place_id');
+       $sOsmType = $oParams->getSet('osmtype', array('N', 'W', 'R'));
+       $iOsmId = $oParams->getInt('osmid', -1);

 
        $oDB =& getDB();
 
 
        $oDB =& getDB();
 

-       $aLangPrefOrder = getPreferredLanguages();
-       $sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
-
-       $sPlaceId = getParamString('place_id');
-       $sOsmType = getParamSet('osmtype', array('N', 'W', 'R'));
-       $iOsmId = getParamInt('osmid', -1);

        if ($sOsmType && $iOsmId > 0)
        {
                $sPlaceId = chksql($oDB->getOne("select place_id from placex where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by type = 'postcode' asc"));
        if ($sOsmType && $iOsmId > 0)
        {
                $sPlaceId = chksql($oDB->getOne("select place_id from placex where osm_type = '".$sOsmType."' and osm_id = ".$iOsmId." order by type = 'postcode' asc"));


@@ -125,7 +126,7 @@
 
        $aPlaceSearchNameKeywords = false;
        $aPlaceSearchAddressKeywords = false;
 
        $aPlaceSearchNameKeywords = false;
        $aPlaceSearchAddressKeywords = false;

-       if (getParamBool('keywords'))
+       if ($oParams->getBool('keywords'))

        {
                $sSQL = "select * from search_name where place_id = $iPlaceID";
                $aPlaceSearchName = $oDB->getRow($sSQL);
        {
                $sSQL = "select * from search_name where place_id = $iPlaceID";
                $aPlaceSearchName = $oDB->getRow($sSQL);