X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/7a50d2f9964421e932313b15f5d7d3b05ded4c45..5464dec0570c2451d8607bc739c6f2b6f298bb75:/website/search.php

diff --git a/website/search.php b/website/search.php
index 3c85c8f7..cff9bb37 100755
--- a/website/search.php
+++ b/website/search.php
@@ -6,14 +6,14 @@
 	require_once(CONST_BasePath.'/lib/log.php');
 	require_once(CONST_BasePath.'/lib/Geocode.php');
 	require_once(CONST_BasePath.'/lib/output.php');
-
 	ini_set('memory_limit', '200M');
 
 	$oDB =& getDB();
+	$oParams = new ParameterParser();
 
 	$oGeocode = new Geocode($oDB);
 
-	$aLangPrefOrder = getPreferredLanguages();
+	$aLangPrefOrder = $oParams->getPreferredLanguages();
 	$oGeocode->setLanguagePreference($aLangPrefOrder);
 
 	if (CONST_Search_ReversePlanForAll
@@ -26,20 +26,21 @@
 	}
 
 	// Format for output
-	$sOutputFormat = getParamSet('format', array('html', 'xml', 'json', 'jsonv2'), 'html');
+	$sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2'), 'html');
 
 	// Show / use polygons
 	if ($sOutputFormat == 'html')
 	{
-		$oGeocode->setIncludePolygonAsText(getParamBool('polygon'));
+		$oGeocode->setIncludePolygonAsText($oParams->getBool('polygon'));
+		$bAsText = false;
 	}
 	else
 	{
-		$bAsPoints = getParamBool('polygon');
-		$bAsGeoJSON = getParamBool('polygon_geojson');
-		$bAsKML = getParamBool('polygon_kml');
-		$bAsSVG = getParamBool('polygon_svg');
-		$bAsText = getParamBool('polygon_text');
+		$bAsPoints = $oParams->getBool('polygon');
+		$bAsGeoJSON = $oParams->getBool('polygon_geojson');
+		$bAsKML = $oParams->getBool('polygon_kml');
+		$bAsSVG = $oParams->getBool('polygon_svg');
+		$bAsText = $oParams->getBool('polygon_text');
 		if ( ( ($bAsGeoJSON?1:0)
 				 + ($bAsKML?1:0)
 				 + ($bAsSVG?1:0)
@@ -65,9 +66,9 @@
 	}
 
 	// Polygon simplification threshold (optional)
-	$oGeocode->setPolygonSimplificationThreshold(getParamFloat('polygon_threshold', 0.0));
+	$oGeocode->setPolygonSimplificationThreshold($oParams->getFloat('polygon_threshold', 0.0));
 
-	$oGeocode->loadParamArray($_GET);
+	$oGeocode->loadParamArray($oParams);
 
 	if (CONST_Search_BatchMode && isset($_GET['batch']))
 	{
@@ -76,30 +77,28 @@
 		foreach($aBatch as $aBatchParams)
 		{
 			$oBatchGeocode = clone $oGeocode;
-			$oBatchGeocode->loadParamArray($aBatchParams);
-			$oBatchGeocode->setQueryFromParams($aBatchParams);
+			$oBatchParams = new ParameterParser($aBatchParams);
+			$oBatchGeocode->loadParamArray($oBatchParams);
+			$oBatchGeocode->setQueryFromParams($oBatchParams);
 			$aSearchResults = $oBatchGeocode->lookup();
 			$aBatchResults[] = $aSearchResults;
 		}
 		include(CONST_BasePath.'/lib/template/search-batch-json.php');
 		exit;
 	}
-	else
+
+	$oGeocode->setQueryFromParams($oParams);
+
+	if (!$oGeocode->getQueryString()
+	    && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
 	{
-		if (!getParamString('q') && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
-		{
-			$sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);
+		$sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);
 
-			// reverse order of '/' separated string
-			$aPhrases = explode('/', $sQuery);
-			$aPhrases = array_reverse($aPhrases);
-			$sQuery = join(', ',$aPhrases);
-			$oGeocode->setQuery($sQuery);
-		}
-		else
-		{
-			$oGeocode->setQueryFromParams($_GET);
-		}
+		// reverse order of '/' separated string
+		$aPhrases = explode('/', $sQuery);
+		$aPhrases = array_reverse($aPhrases);
+		$sQuery = join(', ',$aPhrases);
+		$oGeocode->setQuery($sQuery);
 	}
 
 	$hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
@@ -109,17 +108,16 @@
 
 	if ($sOutputFormat=='html')
 	{
-		$sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
+		$sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
 	}
 	logEnd($oDB, $hLog, sizeof($aSearchResults));
 
-	$bAsText = $oGeocode->getIncludePolygonAsText();
 	$sQuery = $oGeocode->getQueryString();
 	$sViewBox = $oGeocode->getViewBoxString();
 	$bShowPolygons = (isset($_GET['polygon']) && $_GET['polygon']);
 	$aExcludePlaceIDs = $oGeocode->getExcludedPlaceIDs();
 
-	$sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$oGeocode->getExcludedPlaceIDs());
+	$sMoreURL = CONST_Website_BaseURL.'search.php?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs);
 	if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
 	if ($bShowPolygons) $sMoreURL .= '&polygon=1';
 	if ($oGeocode->getIncludeAddressDetails()) $sMoreURL .= '&addressdetails=1';