introduce chksql function for website code and move other fail functions

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index ac0b4bdd65b25279fb12ee21da5cf3d441fcb900..4baf3ef5572b9b9fc288b7e7485aa3778eb1f30c 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -1,19 +1,16 @@
 <?php
        @define('CONST_ConnectionBucket_PageType', 'Search');
 
-       require_once(dirname(dirname(__FILE__)).'/lib/init-website.php');
+       require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+       require_once(CONST_BasePath.'/lib/init-website.php');
        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();
 
-       // Display defaults
-       $fLat = CONST_Default_Lat;
-       $fLon = CONST_Default_Lon;
-       $iZoom = CONST_Default_Zoom;
-
        $oGeocode = new Geocode($oDB);
 
        $aLangPrefOrder = getPreferredLanguages();
@@ -29,24 +26,20 @@
        }
 
        // Format for output
-       $sOutputFormat = 'html';
-       if (isset($_GET['format']) && ($_GET['format'] == 'html' || $_GET['format'] == 'xml' || $_GET['format'] == 'json' ||  $_GET['format'] == 'jsonv2'))
-       {
-               $sOutputFormat = $_GET['format'];
-       }
+       $sOutputFormat = getParamSet('format', array('html', 'xml', 'json', 'jsonv2'), 'html');
 
        // Show / use polygons
        if ($sOutputFormat == 'html')
        {
-               if (isset($_GET['polygon'])) $oGeocode->setIncludePolygonAsText((bool)$_GET['polygon']);
+               $oGeocode->setIncludePolygonAsText(getParamBool('polygon'));
        }
        else
        {
-               $bAsPoints = (boolean)isset($_GET['polygon']) && $_GET['polygon'];
-               $bAsGeoJSON = (boolean)isset($_GET['polygon_geojson']) && $_GET['polygon_geojson'];
-               $bAsKML = (boolean)isset($_GET['polygon_kml']) && $_GET['polygon_kml'];
-               $bAsSVG = (boolean)isset($_GET['polygon_svg']) && $_GET['polygon_svg'];
-               $bAsText = (boolean)isset($_GET['polygon_text']) && $_GET['polygon_text'];
+               $bAsPoints = getParamBool('polygon');
+               $bAsGeoJSON = getParamBool('polygon_geojson');
+               $bAsKML = getParamBool('polygon_kml');
+               $bAsSVG = getParamBool('polygon_svg');
+               $bAsText = getParamBool('polygon_text');
                if ( ( ($bAsGeoJSON?1:0)
                                 + ($bAsKML?1:0)
                                 + ($bAsSVG?1:0)
@@ -72,9 +65,7 @@
        }
 
        // Polygon simplification threshold (optional)
-       $fThreshold = 0.0;
-       if (isset($_GET['polygon_threshold'])) $fThreshold = (float)$_GET['polygon_threshold'];
-       $oGeocode->setPolygonSimplificationThreshold($fThreshold);
+       $oGeocode->setPolygonSimplificationThreshold(getParamFloat('polygon_threshold', 0.0));
 
        $oGeocode->loadParamArray($_GET);
 
@@ -95,7 +86,7 @@
        }
        else
        {
-               if (!(isset($_GET['q']) && $_GET['q']) && 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);
 
@@ -118,9 +109,7 @@
 
        if ($sOutputFormat=='html')
        {
-               $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
-               $sTileURL = CONST_Map_Tile_URL;
-               $sTileAttribution = CONST_Map_Tile_Attribution;
+               $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));