X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/8c7bd6beabb9b877a155c554147f4a3ce8378e7e..9b01ddd641e72c2d7fb5864f0079a5a39563eb7d:/utils/setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 0521b15d..6415ea12 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -18,6 +18,7 @@
 		array('create-db', '', 0, 1, 0, 0, 'bool', 'Create nominatim db'),
 		array('setup-db', '', 0, 1, 0, 0, 'bool', 'Build a blank nominatim db'),
 		array('import-data', '', 0, 1, 0, 0, 'bool', 'Import a osm file'),
+		array('osm2pgsql-cache', '', 0, 1, 1, 1, 'int', 'Cache size used by osm2pgsql'),
 		array('create-functions', '', 0, 1, 0, 0, 'bool', 'Create functions'),
 		array('create-minimal-tables', '', 0, 1, 0, 0, 'bool', 'Create minimal main tables'),
 		array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
@@ -49,6 +50,15 @@
 		$iInstances = getProcessorCount();
 		echo "WARNING: resetting threads to $iInstances\n";
 	}
+
+	// Assume we can steal all the cache memory in the box (unless told otherwise)
+	$iCacheMemory = (isset($aCMDResult['osm2pgsql-cache'])?$aCMDResult['osm2pgsql-cache']:getCacheMemoryMB());
+	if ($iCacheMemory > getTotalMemoryMB())
+	{
+		$iCacheMemory = getCacheMemoryMB();
+		echo "WARNING: resetting cache memory to $iCacheMemory\n";
+	}
+
 	if (isset($aCMDResult['osm-file']) && !isset($aCMDResult['osmosis-init-date']))
 	{
 		$sBaseFile = basename($aCMDResult['osm-file']);
@@ -71,7 +81,7 @@
 		{
 			fail('database already exists ('.CONST_Database_DSN.')');
 		}
-		passthru('createdb '.$aDSNInfo['database']);
+		passthru('createdb -E UTF-8 '.$aDSNInfo['database']);
 	}
 
 	if ($aCMDResult['create-db'] || $aCMDResult['all'])
@@ -82,7 +92,7 @@
 
 		$oDB =& getDB();
 		passthru('createlang plpgsql '.$aDSNInfo['database']);
-        $pgver = (float) CONST_Postgresql_Version;
+		$pgver = (float) CONST_Postgresql_Version;
 		if ($pgver < 9.1) {
 			pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql');
 		} else {
@@ -107,7 +117,10 @@
 
 		$osm2pgsql = CONST_Osm2pgsql_Binary;
 		if (!file_exists($osm2pgsql)) fail("please download and build osm2pgsql");
-		passthru($osm2pgsql.' -lsc -O gazetteer -C 12000 --hstore -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file']);
+		$osm2pgsql .= ' -lsc -O gazetteer --hstore';
+		$osm2pgsql .= ' -C '.$iCacheMemory;
+		$osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
+		passthru($osm2pgsql);
 
 		$oDB =& getDB();
 		$x = $oDB->getRow('select * from place limit 1');
@@ -284,7 +297,7 @@
 			$aDBInstances[$i] =& getDB(true);
 		}
 
-		foreach(glob(CONST_BasePath.'/data/tiger2009/*.sql') as $sFile)
+		foreach(glob(CONST_BasePath.'/data/tiger2011/*.sql') as $sFile)
 		{
 			echo $sFile.': ';
 			$hFile = fopen($sFile, "r");
@@ -346,20 +359,30 @@
 		if (!pg_query($oDB->connection, $sSQL)) fail(pg_last_error($oDB->connection));
 	}
 
-	if ($aCMDResult['osmosis-init'] && isset($aCMDResult['osmosis-init-date']))
+	if (($aCMDResult['osmosis-init'] || $aCMDResult['all']) && isset($aCMDResult['osmosis-init-date']))
 	{
 		$bDidSomething = true;
+		$oDB =& getDB();
 
 		if (!file_exists(CONST_Osmosis_Binary)) fail("please download osmosis");
 		if (file_exists(CONST_BasePath.'/settings/configuration.txt')) echo "settings/configuration.txt already exists\n";
 		else passthru(CONST_Osmosis_Binary.' --read-replication-interval-init '.CONST_BasePath.'/settings');
 
 		$sDate = $aCMDResult['osmosis-init-date'];
-		$sURL = 'http://toolserver.org/~mazder/replicate-sequences/?'.$sDate;
+		$aDate = date_parse_from_format("Y-m-d\TH-i", $sDate);
+		$sURL = 'http://toolserver.org/~mazder/replicate-sequences/?';
+		$sURL .= 'Y='.$aDate['year'].'&m='.$aDate['month'].'&d='.$aDate['day'];
+		$sURL .= '&H='.$aDate['hour'].'&i='.$aDate['minute'].'&s=0';
+		$sURL .= '&stream=minute';
 		echo "Getting state file: $sURL\n";
 		$sStateFile = file_get_contents($sURL);
 		if (!$sStateFile || strlen($sStateFile) > 1000) fail("unable to obtain state file");
 		file_put_contents(CONST_BasePath.'/settings/state.txt', $sStateFile);
+		echo "Updating DB status\n";
+		pg_query($oDB->connection, 'TRUNCATE import_status');
+		$sSQL = "INSERT INTO import_status VALUES('".$sDate."')";
+		pg_query($oDB->connection, $sSQL);
+
 	}
 
 	if ($aCMDResult['index'] || $aCMDResult['all'])