X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/0dafda7327014d7591df397cb9c54df8f172e677..fbaca0c19e66dd8a5383104ca65c63b4b72c5309:/website/search.php

diff --git a/website/search.php b/website/search.php
index b205e57e..24f21e12 100755
--- a/website/search.php
+++ b/website/search.php
@@ -5,6 +5,7 @@
 	require_once(CONST_BasePath.'/lib/log.php');
 
 	ini_set('memory_limit', '200M');
+
 	$oDB =& getDB();
 
 	// Display defaults
@@ -70,6 +71,7 @@
 	if (isset($aLangPrefOrder['name:de'])) $bReverseInPlan = true;
 	if (isset($aLangPrefOrder['name:ru'])) $bReverseInPlan = true;
 	if (isset($aLangPrefOrder['name:ja'])) $bReverseInPlan = true;
+	if (isset($aLangPrefOrder['name:pl'])) $bReverseInPlan = true;
 
 	$sLanguagePrefArraySQL = "ARRAY[".join(',',array_map("getDBQuoted",$aLangPrefOrder))."]";
 
@@ -887,7 +889,7 @@
 							if ($bBoundingBoxSearch) $aTerms[] = "centroid && $sViewboxSmallSQL";
 							if ($sNearPointSQL) $aOrder[] = "ST_Distance($sNearPointSQL, centroid) asc";
 
-							$sImportanceSQL = 'case when importance = 0 OR importance IS NULL then 0.92-(search_rank::float/33) else importance end';
+							$sImportanceSQL = 'case when importance = 0 OR importance IS NULL then 0.75-(search_rank::float/40) else importance end';
 
 							if ($sViewboxSmallSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxSmallSQL, centroid) THEN 1 ELSE 0.5 END";
 							if ($sViewboxLargeSQL) $sImportanceSQL .= " * case when ST_Contains($sViewboxLargeSQL, centroid) THEN 1 ELSE 0.5 END";
@@ -906,12 +908,17 @@
 								else
 									$sSQL .= " limit ".$iLimit;
 
-								if (CONST_Debug) { var_dump($sSQL); }
+								if (CONST_Debug) var_dump($sSQL);
+								$iStartTime = time();
 								$aViewBoxPlaceIDs = $oDB->getAll($sSQL);
 								if (PEAR::IsError($aViewBoxPlaceIDs))
 								{
 									failInternalError("Could not get places for search terms.", $sSQL, $aViewBoxPlaceIDs);
 								}
+								if (time() - $iStartTime > 60) {
+									file_put_contents(CONST_BasePath.'/log/long_queries.log', date('Y-m-d H:i:s', $iStartTime).' '.$sSQL."\n", FILE_APPEND);
+								}
+
 //var_dump($aViewBoxPlaceIDs);
 								// Did we have an viewbox matches?
 								$aPlaceIDs = array();
@@ -1133,7 +1140,7 @@
 					$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
 					$sSQL .= "avg(ST_X(ST_Centroid(geometry))) as lon,avg(ST_Y(ST_Centroid(geometry))) as lat, ";
 //					$sSQL .= $sOrderSQL." as porder, ";
-					$sSQL .= "coalesce(importance,0.9-(rank_search::float/30)) as importance ";
+					$sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance ";
 					$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
 					$sSQL .= "and placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
 					if ($sAllowedTypesSQLList) $sSQL .= "and placex.class in $sAllowedTypesSQLList ";
@@ -1203,7 +1210,7 @@
 					$sSQL .= "get_name_by_language(name, ARRAY['ref']) as ref,";
 					$sSQL .= "avg(ST_X(ST_Centroid(geometry))) as lon,avg(ST_Y(ST_Centroid(geometry))) as lat, ";
 //					$sSQL .= $sOrderSQL." as porder, ";
-					$sSQL .= "coalesce(importance,0.9-(rank_search::float/30)) as importance ";
+					$sSQL .= "coalesce(importance,0.75-(rank_search::float/40)) as importance ";
 					$sSQL .= "from placex where place_id in ($sPlaceIDs) ";
 					$sSQL .= "and placex.rank_address between $iMinAddressRank and $iMaxAddressRank ";
 					$sSQL .= "group by osm_type,osm_id,class,type,admin_level,rank_search,rank_address,country_code,importance";
@@ -1433,8 +1440,6 @@
 	}
 	uasort($aSearchResults, 'byImportance');
 
-//var_dump($aSearchResults);exit;
-	
 	$aOSMIDDone = array();
 	$aClassTypeNameDone = array();
 	$aToFilter = $aSearchResults;
@@ -1476,7 +1481,7 @@
 		logEnd($oDB, $hLog, sizeof($aToFilter));
 	}
  	$sMoreURL = CONST_Website_BaseURL.'search?format='.urlencode($sOutputFormat).'&exclude_place_ids='.join(',',$aExcludePlaceIDs);
-	$sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
+	if (isset($_SERVER["HTTP_ACCEPT_LANGUAGE"])) $sMoreURL .= '&accept-language='.$_SERVER["HTTP_ACCEPT_LANGUAGE"];
 	if ($bShowPolygons) $sMoreURL .= '&polygon=1';
 	if ($bShowAddressDetails) $sMoreURL .= '&addressdetails=1';
 	if (isset($_GET['viewbox']) && $_GET['viewbox']) $sMoreURL .= '&viewbox='.urlencode($_GET['viewbox']);