Merge pull request #381 from lonvia/cmake-port

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index 9137beade1921d8ab619b19f80f04d24978476b7..ac0b4bdd65b25279fb12ee21da5cf3d441fcb900 100755 (executable)
--- a/website/search.php
+++ b/website/search.php
@@ -14,7 +14,7 @@
        $fLon = CONST_Default_Lon;
        $iZoom = CONST_Default_Zoom;
 
        $fLon = CONST_Default_Lon;
        $iZoom = CONST_Default_Zoom;
 

-       $oGeocode =& new Geocode($oDB);
+       $oGeocode = new Geocode($oDB);

 
        $aLangPrefOrder = getPreferredLanguages();
        $oGeocode->setLanguagePreference($aLangPrefOrder);
 
        $aLangPrefOrder = getPreferredLanguages();
        $oGeocode->setLanguagePreference($aLangPrefOrder);


@@ -97,17 +97,17 @@
        {
                if (!(isset($_GET['q']) && $_GET['q']) && isset($_SERVER['PATH_INFO']) && $_SERVER['PATH_INFO'][0] == '/')
                {
        {
                if (!(isset($_GET['q']) && $_GET['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);
+                       // reverse order of '/' separated string
+                       $aPhrases = explode('/', $sQuery);
+                       $aPhrases = array_reverse($aPhrases);
+                       $sQuery = join(', ',$aPhrases);
+                       $oGeocode->setQuery($sQuery);

                }
                else
                {
                }
                else
                {

-                               $oGeocode->setQueryFromParams($_GET);
+                       $oGeocode->setQueryFromParams($_GET);

                }
        }
 
                }
        }
 


@@ -116,8 +116,12 @@
        $aSearchResults = $oGeocode->lookup();
        if ($aSearchResults === false) $aSearchResults = array();
 
        $aSearchResults = $oGeocode->lookup();
        if ($aSearchResults === false) $aSearchResults = array();
 

-       $sDataDate = $oDB->getOne("select TO_CHAR(lastimportdate - '2 minutes'::interval,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1");
-
+       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;
+       }

        logEnd($oDB, $hLog, sizeof($aSearchResults));
 
        $bAsText = $oGeocode->getIncludePolygonAsText();
        logEnd($oDB, $hLog, sizeof($aSearchResults));
 
        $bAsText = $oGeocode->getIncludePolygonAsText();