From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 26 Aug 2012 06:02:50 +0000 (+0200)
Subject: Merge branch 'master' of http://github.com/twain47/Nominatim
X-Git-Tag: deploy~677
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/8d6d813f6b8782c05a71980e0f139bbb18739c28?ds=sidebyside;hp=-c

Merge branch 'master' of http://github.com/twain47/Nominatim
---

8d6d813f6b8782c05a71980e0f139bbb18739c28
diff --combined utils/setup.php
index fb83dd0a,1db725c4..8e3d1cb5
--- a/utils/setup.php
+++ b/utils/setup.php
@@@ -43,6 -43,26 +43,26 @@@
  
  	$bDidSomething = false;
  
+ 	// Check if osm-file is set and points to a valid file if --all or --import-data is given
+ 	if ($aCMDResult['import-data'] || $aCMDResult['all'])
+ 	{
+ 		if (!isset($aCMDResult['osm-file']))
+ 		{
+ 			fail('missing --osm-file for data import');
+ 		}
+ 
+ 		if (!file_exists($aCMDResult['osm-file']))
+ 		{
+ 			fail('the path supplied to --osm-file does not exist');
+ 		}
+ 
+ 		if (!is_readable($aCMDResult['osm-file']))
+ 		{
+ 			fail('osm-file "'.$aCMDResult['osm-file'].'" not readable');
+ 		}
+ 	}
+ 
+ 
  	// This is a pretty hard core default - the number of processors in the box - 1
  	$iInstances = isset($aCMDResult['threads'])?$aCMDResult['threads']:(getProcessorCount()-1);
  	if ($iInstances < 1)
@@@ -89,9 -109,9 +109,9 @@@
  		passthru('createdb -E UTF-8 '.$aDSNInfo['database']);
  	}
  
- 	if ($aCMDResult['create-db'] || $aCMDResult['all'])
+ 	if ($aCMDResult['setup-db'] || $aCMDResult['all'])
  	{
- 		echo "Create DB (2)\n";
+ 		echo "Setup DB\n";
  		$bDidSomething = true;
  		// TODO: path detection, detection memory, etc.
  
@@@ -126,9 -146,8 +146,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 .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
  		passthruCheckReturn($osm2pgsql);
  
@@@ -321,7 -340,6 +341,7 @@@
  			echo '.';
  		}
  		echo "\n";
 +		pgsqlRunScript('ALTER TABLE place SET TABLESPACE "data"');
  		echo "Reanalysing database...\n";
  		pgsqlRunScript('ANALYSE');
  	}
diff --combined website/search.php
index a337e1ef,60df370d..27d31fa2
--- a/website/search.php
+++ b/website/search.php
@@@ -312,12 -312,7 +312,12 @@@
  			// Check which tokens we have, get the ID numbers			
  			$sSQL = 'select word_id,word_token, word, class, type, location, country_code, operator';
  			$sSQL .= ' from word where word_token in ('.join(',',array_map("getDBQuoted",$aTokens)).')';
 -			$sSQL .= ' and (class is null or class not in (\'highway\'))';
 +			// HACK WARNING
 +			// (mis)using search_name_count to exclude words that return too many
 +			// search results. saerch_name_count is currently set to 1 by hand
 +			// because there is no fast way to extract this count from a live database. 
 +			$sSQL .= ' and search_name_count = 0';
 +//			$sSQL .= ' and (class is null or class not in (\'highway\'))';
  //			$sSQL .= ' group by word_token, word, class, type, location, country_code';
  
  			if (CONST_Debug) var_Dump($sSQL);
@@@ -796,16 -791,11 +796,16 @@@
  									$sSQL .= " limit ".$iLimit;
  
  								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();
@@@ -1278,7 -1268,7 +1278,7 @@@
  		{
  			if (stripos($sAddress, $sWord)!==false) $iCountWords++;
  		}
- 		$aResult['importance'] = $aResult['importance'] + $iCountWords;
+ 		$aResult['importance'] = $aResult['importance'] + ($iCountWords*0.1); // 0.1 is a completely arbitrary number but something in the range 0.1 to 0.5 would seem right
  
  //if (CONST_Debug) var_dump($aResult['class'].':'.$aResult['type'].':'.$aResult['admin_level']);
  /*