Merge remote-tracking branch 'upstream/master'

[nominatim.git] / website / search.php

diff --git a/website/search.php b/website/search.php
index a9bb3f0b0d381cbef5f9f325330317c6b4b2c35b..43c9fd010ac8389c3f67f8143de1545399bef667 100644 (file)
--- a/website/search.php
+++ b/website/search.php
@@ -25,11 +25,10 @@ if (CONST_Search_ReversePlanForAll
 }
 
 // Format for output
 }
 
 // Format for output

-$sOutputFormat = $oParams->getSet('format', array('html', 'xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'html');
+$sOutputFormat = $oParams->getSet('format', array('xml', 'json', 'jsonv2', 'geojson', 'geocodejson'), 'jsonv2');

 set_exception_handler_by_format($sOutputFormat);
 
 set_exception_handler_by_format($sOutputFormat);
 

-$sForcedGeometry = ($sOutputFormat == 'html') ? 'geojson' : null;
-$oGeocode->loadParamArray($oParams, $sForcedGeometry);
+$oGeocode->loadParamArray($oParams, null);

 
 if (CONST_Search_BatchMode && isset($_GET['batch'])) {
     $aBatch = json_decode($_GET['batch'], true);
 
 if (CONST_Search_BatchMode && isset($_GET['batch'])) {
     $aBatch = json_decode($_GET['batch'], true);


@@ -50,6 +49,7 @@ $oGeocode->setQueryFromParams($oParams);
 
 if (!$oGeocode->getQueryString()
     && isset($_SERVER['PATH_INFO'])
 
 if (!$oGeocode->getQueryString()
     && isset($_SERVER['PATH_INFO'])

+    && strlen($_SERVER['PATH_INFO']) > 0

     && $_SERVER['PATH_INFO'][0] == '/'
 ) {
     $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);
     && $_SERVER['PATH_INFO'][0] == '/'
 ) {
     $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);


@@ -65,19 +65,26 @@ $hLog = logStart($oDB, 'search', $oGeocode->getQueryString(), $aLangPrefOrder);
 
 $aSearchResults = $oGeocode->lookup();
 
 
 $aSearchResults = $oGeocode->lookup();
 

-if ($sOutputFormat=='html') {
-    $sDataDate = chksql($oDB->getOne("select TO_CHAR(lastimportdate,'YYYY/MM/DD HH24:MI')||' GMT' from import_status limit 1"));
-}

 logEnd($oDB, $hLog, count($aSearchResults));
 
 $sQuery = $oGeocode->getQueryString();
 
 $aMoreParams = $oGeocode->getMoreUrlParams();
 logEnd($oDB, $hLog, count($aSearchResults));
 
 $sQuery = $oGeocode->getQueryString();
 
 $aMoreParams = $oGeocode->getMoreUrlParams();

-if ($sOutputFormat != 'html') $aMoreParams['format'] = $sOutputFormat;
+$aMoreParams['format'] = $sOutputFormat;

 if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
     $aMoreParams['accept-language'] = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
 }
 if (isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) {
     $aMoreParams['accept-language'] = $_SERVER['HTTP_ACCEPT_LANGUAGE'];
 }

-$sMoreURL = CONST_Website_BaseURL.'search.php?'.http_build_query($aMoreParams);
+
+if (isset($_SERVER['REQUEST_SCHEME'])
+    && isset($_SERVER['SERVER_NAME'])
+    && isset($_SERVER['DOCUMENT_URI'])
+) {
+    $sMoreURL = $_SERVER['REQUEST_SCHEME'].'://'
+                .$_SERVER['SERVER_NAME'].$_SERVER['DOCUMENT_URI'].'/?'
+                .http_build_query($aMoreParams);
+} else {
+    $sMoreURL = '/search.php'.http_build_query($aMoreParams);
+}

 
 if (CONST_Debug) exit;
 
 
 if (CONST_Debug) exit;