From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 7 Apr 2013 16:00:49 +0000 (+0200)
Subject: Merge remote-tracking branch 'upstream/master'
X-Git-Tag: deploy~625
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/356724fb8b8d34ba92b5161dec91e7afb18ab99e?hp=-c

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

356724fb8b8d34ba92b5161dec91e7afb18ab99e
diff --combined utils/setup.php
index f8da1970,5b01798e..d2d4381e
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -155,9 -155,8 +155,9 @@@
  			echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
  			fail("osm2pgsql not found in '$osm2pgsql'");
  		}
 +		$osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
  		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
 -		$osm2pgsql .= ' -C '.$iCacheMemory;
 +		$osm2pgsql .= ' -C 16000';
  		$osm2pgsql .= ' -P '.$aDSNInfo['port'];
  		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
  		passthruCheckReturn($osm2pgsql);
@@@ -482,7 -481,7 +482,7 @@@
  		$sSQL .= "select 'P',nextval('seq_postcodes'),'place','postcode',postcode,calculated_country_code,";
  		$sSQL .= "ST_SetSRID(ST_Point(x,y),4326) as geometry from (select calculated_country_code,postcode,";
  		$sSQL .= "avg(st_x(st_centroid(geometry))) as x,avg(st_y(st_centroid(geometry))) as y ";
 -		$sSQL .= "from placex where postcode is not null group by calculated_country_code,postcode) as x";
 +		$sSQL .= "from placex where postcode is not null and calculated_country_code not in ('ie') group by calculated_country_code,postcode) as x";
  		if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
  
  		$sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,calculated_country_code,geometry) ";
@@@ -514,10 -513,10 +514,10 @@@
  		}
  
  		// Find the last node in the DB
- 		$iLastOSMID = $oDB->getOne("select max(osm_id) as osm_id from place where osm_type = 'N'");
+ 		$iLastOSMID = $oDB->getOne("select max(id) from planet_osm_nodes");
  
  		// Lookup the timestamp that node was created (less 3 hours for margin for changsets to be closed)
- 		$sLastNodeURL = 'http://www.openstreetmap.org/api/0.6/node/'.$iLastOSMID;
+ 		$sLastNodeURL = 'http://www.openstreetmap.org/api/0.6/node/'.$iLastOSMID."/1";
  		$sLastNodeXML = file_get_contents($sLastNodeURL);
  		preg_match('#timestamp="(([0-9]{4})-([0-9]{2})-([0-9]{2})T([0-9]{2}):([0-9]{2}):([0-9]{2})Z)"#', $sLastNodeXML, $aLastNodeDate);
  		$iLastNodeTimestamp = strtotime($aLastNodeDate[1]) - (3*60*60);
diff --combined website/search.php
index d0c45c70,b6e7e241..5733dde4
--- 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))."]";
  
@@@ -309,7 -308,7 +309,7 @@@
  				$aSpecialTerms[strtolower($aSpecialTerm[1])] = $aSpecialTerm[2];
  			}
  
- 			preg_match_all('/\\[([a-zA-Z]*)\\]/', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
+ 			preg_match_all('/\\[([\\w ]*)\\]/u', $sQuery, $aSpecialTermsRaw, PREG_SET_ORDER);
  			$aSpecialTerms = array();
  			if (isset($aStructuredQuery['amenity']) && $aStructuredQuery['amenity'])
  			{
@@@ -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();