From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 24 Feb 2013 22:07:36 +0000 (+0100)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~636
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/4496d10c9fd25c0b2396edc8e4f124840361dea1?hp=-c

Merge remote-tracking branch 'upstream/master'
---

4496d10c9fd25c0b2396edc8e4f124840361dea1
diff --combined website/search.php
index 6319a835,b223dbcf..a6e94f5e
--- a/website/search.php
+++ b/website/search.php
@@@ -71,7 -71,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))."]";
  
@@@ -432,7 -431,7 +432,7 @@@
  				{
  					$aValidTokens[$aToken['word_token']] = array($aToken);
  				}
- 				if ($aToken['word_token'][0]==' ' && !$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;
+ 				if (!$aToken['class'] && !$aToken['country_code']) $aPossibleMainWordIDs[$aToken['word_id']] = 1;
  				$aWordFrequencyScores[$aToken['word_id']] = $aToken['search_name_count'] + 1;
  			}
  			if (CONST_Debug) var_Dump($aPhrases, $aValidTokens);
@@@ -978,17 -977,12 +978,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();