X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/a32f6c66b8c4c5c985f3ae71577404d76716d6e6..cf4a44aaf7f8dd9ac7396deb0fe597980e22df96:/utils/setup.php diff --git a/utils/setup.php b/utils/setup.php index f1855673..94c7edb5 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -37,7 +37,6 @@ array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'), array('index-noanalyse', '', 0, 1, 0, 0, 'bool', 'Do not perform analyse operations during index (EXPERT)'), array('create-search-indices', '', 0, 1, 0, 0, 'bool', 'Create additional indices required for search and update'), - array('create-website', '', 0, 1, 1, 1, 'realpath', 'Create symlinks to setup web directory'), array('drop', '', 0, 1, 0, 0, 'bool', 'Drop tables needed for updates, making the database readonly (EXPERIMENTAL)'), ); getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true); @@ -94,7 +93,7 @@ { echo "Create DB\n"; $bDidSomething = true; - $oDB =& DB::connect(CONST_Database_DSN, false); + $oDB = DB::connect(CONST_Database_DSN, false); if (!PEAR::isError($oDB)) { fail('database already exists ('.CONST_Database_DSN.')'); @@ -124,11 +123,8 @@ // For extratags and namedetails the hstore_to_json converter is // needed which is only available from Postgresql 9.3+. For older // versions add a dummy function that returns nothing. - $iNumFunc = $oDB->getOne("select count(*) from pg_proc where proname = 'hstore_to_json'"); - if (PEAR::isError($iNumFunc)) - { - fail("Cannot query stored procedures.", $iNumFunc); - } + $iNumFunc = chksql($oDB->getOne("select count(*) from pg_proc where proname = 'hstore_to_json'")); + if ($iNumFunc == 0) { pgsqlRunScript("create function hstore_to_json(dummy hstore) returns text AS 'select null::text' language sql immutable"); @@ -205,11 +201,10 @@ passthruCheckReturn($osm2pgsql); $oDB =& getDB(); - $x = $oDB->getRow('select * from place limit 1'); - if (PEAR::isError($x)) { - fail($x->getMessage()); + if (!chksql($oDB->getRow('select * from place limit 1'))) + { + fail('No Data'); } - if (!$x) fail('No Data'); } if ($aCMDResult['create-functions'] || $aCMDResult['all']) @@ -217,7 +212,7 @@ echo "Functions\n"; $bDidSomething = true; if (!file_exists(CONST_InstallPath.'/module/nominatim.so')) fail("nominatim module not built"); - create_sql_functions(); + create_sql_functions($aCMDResult); } if ($aCMDResult['create-tables'] || $aCMDResult['all']) @@ -243,21 +238,13 @@ // re-run the functions echo "Functions\n"; - create_sql_functions(); + create_sql_functions($aCMDResult); } if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) { echo "Partition Tables\n"; $bDidSomething = true; - $oDB =& getDB(); - $sSQL = 'select distinct partition from country_name'; - $aPartitions = $oDB->getCol($sSQL); - if (PEAR::isError($aPartitions)) - { - fail($aPartitions->getMessage()); - } - if (!$aCMDResult['no-partitions']) $aPartitions[] = 0; $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql'); $sTemplate = replace_tablespace('{ts:address-data}', @@ -272,18 +259,8 @@ CONST_Tablespace_Aux_Data, $sTemplate); $sTemplate = replace_tablespace('{ts:aux-index}', CONST_Tablespace_Aux_Index, $sTemplate); - preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER); - foreach($aMatches as $aMatch) - { - $sResult = ''; - foreach($aPartitions as $sPartitionName) - { - $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]); - } - $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate); - } - pgsqlRunScript($sTemplate); + pgsqlRunPartitionScript($sTemplate); } @@ -291,28 +268,10 @@ { echo "Partition Functions\n"; $bDidSomething = true; - $oDB =& getDB(); - $sSQL = 'select distinct partition from country_name'; - $aPartitions = $oDB->getCol($sSQL); - if (PEAR::isError($aPartitions)) - { - fail($aPartitions->getMessage()); - } - if (!$aCMDResult['no-partitions']) $aPartitions[] = 0; $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-functions.src.sql'); - preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER); - foreach($aMatches as $aMatch) - { - $sResult = ''; - foreach($aPartitions as $sPartitionName) - { - $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]); - } - $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate); - } - pgsqlRunScript($sTemplate); + pgsqlRunPartitionScript($sTemplate); } if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) @@ -353,6 +312,8 @@ echo '.'; if (!pg_query($oDB->connection, 'TRUNCATE placex')) fail(pg_last_error($oDB->connection)); echo '.'; + if (!pg_query($oDB->connection, 'TRUNCATE location_property_osmline')) fail(pg_last_error($oDB->connection)); + echo '.'; if (!pg_query($oDB->connection, 'TRUNCATE place_addressline')) fail(pg_last_error($oDB->connection)); echo '.'; if (!pg_query($oDB->connection, 'TRUNCATE place_boundingbox')) fail(pg_last_error($oDB->connection)); @@ -369,11 +330,7 @@ echo '.'; $sSQL = 'select distinct partition from country_name'; - $aPartitions = $oDB->getCol($sSQL); - if (PEAR::isError($aPartitions)) - { - fail($aPartitions->getMessage()); - } + $aPartitions = chksql($oDB->getCol($sSQL)); if (!$aCMDResult['no-partitions']) $aPartitions[] = 0; foreach($aPartitions as $sPartition) { @@ -394,20 +351,30 @@ echo "Load Data\n"; $aDBInstances = array(); - for($i = 0; $i < $iInstances; $i++) + $iLoadThreads = max(1, $iInstances - 1); + for($i = 0; $i < $iLoadThreads; $i++) { $aDBInstances[$i] =& getDB(true); $sSQL = 'insert into placex (osm_type, osm_id, class, type, name, admin_level, '; $sSQL .= 'housenumber, street, addr_place, isin, postcode, country_code, extratags, '; - $sSQL .= 'geometry) select * from place where osm_id % '.$iInstances.' = '.$i; + $sSQL .= 'geometry) select * from place where osm_id % '.$iLoadThreads.' = '.$i; + $sSQL .= " and not (class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString')"; if ($aCMDResult['verbose']) echo "$sSQL\n"; if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection)); } + // last thread for interpolation lines + $aDBInstances[$iLoadThreads] =& getDB(true); + $sSQL = 'select insert_osmline (osm_id, housenumber, street, addr_place, postcode, country_code, '; + $sSQL .= 'geometry) from place where '; + $sSQL .= "class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString'"; + if ($aCMDResult['verbose']) echo "$sSQL\n"; + if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($oDB->connection)); + $bAnyBusy = true; while($bAnyBusy) { $bAnyBusy = false; - for($i = 0; $i < $iInstances; $i++) + for($i = 0; $i <= $iLoadThreads; $i++) { if (pg_connection_busy($aDBInstances[$i]->connection)) $bAnyBusy = true; } @@ -633,37 +600,6 @@ pgsqlRunScript($sTemplate); } - if (isset($aCMDResult['create-website'])) - { - $bDidSomething = true; - $sTargetDir = $aCMDResult['create-website']; - if (!is_dir($sTargetDir)) - { - echo "You must create the website directory before calling this function.\n"; - fail("Target directory does not exist."); - } - - @symlink(CONST_InstallPath.'/website/details.php', $sTargetDir.'/details.php'); - @symlink(CONST_InstallPath.'/website/reverse.php', $sTargetDir.'/reverse.php'); - @symlink(CONST_InstallPath.'/website/search.php', $sTargetDir.'/search.php'); - @symlink(CONST_InstallPath.'/website/search.php', $sTargetDir.'/index.php'); - @symlink(CONST_InstallPath.'/website/lookup.php', $sTargetDir.'/lookup.php'); - @symlink(CONST_InstallPath.'/website/deletable.php', $sTargetDir.'/deletable.php'); - @symlink(CONST_InstallPath.'/website/polygons.php', $sTargetDir.'/polygons.php'); - @symlink(CONST_InstallPath.'/website/status.php', $sTargetDir.'/status.php'); - @symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images'); - @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js'); - @symlink(CONST_BasePath.'/website/css', $sTargetDir.'/css'); - echo "Symlinks created\n"; - - $sTestFile = @file_get_contents(CONST_Website_BaseURL.'js/tiles.js'); - if (!$sTestFile) - { - echo "\nWARNING: Unable to access the website at ".CONST_Website_BaseURL."\n"; - echo "You may want to update settings/local.php with @define('CONST_Website_BaseURL', 'http://[HOST]/[PATH]/');\n"; - } - } - if ($aCMDResult['drop']) { // The implementation is potentially a bit dangerous because it uses @@ -693,11 +629,8 @@ $oDB =& getDB(); $aDropTables = array(); - $aHaveTables = $oDB->getCol("SELECT tablename FROM pg_tables WHERE schemaname='public'"); - if (PEAR::isError($aHaveTables)) - { - fail($aPartitions->getMessage()); - } + $aHaveTables = chksql($oDB->getCol("SELECT tablename FROM pg_tables WHERE schemaname='public'")); + foreach($aHaveTables as $sTable) { $bFound = false; @@ -826,6 +759,28 @@ } } + function pgsqlRunPartitionScript($sTemplate) + { + $oDB =& getDB(); + + $sSQL = 'select distinct partition from country_name'; + $aPartitions = chksql($oDB->getCol($sSQL)); + if (!$aCMDResult['no-partitions']) $aPartitions[] = 0; + + preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER); + foreach($aMatches as $aMatch) + { + $sResult = ''; + foreach($aPartitions as $sPartitionName) + { + $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]); + } + $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate); + } + + pgsqlRunScript($sTemplate); + } + function pgsqlRunRestoreData($sDumpFile) { // Convert database DSN to psql parameters @@ -900,7 +855,7 @@ return $sSql; } - function create_sql_functions() + function create_sql_functions($aCMDResult) { $sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql'); $sTemplate = str_replace('{modulepath}', CONST_InstallPath.'/module', $sTemplate);