X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/31273a42bd925fa6baad86504c760c93e051106c..80cf5df1cd5c249a547f877c73fd6feba9b763b0:/utils/setup.php diff --git a/utils/setup.php b/utils/setup.php index 26d9e8c6..94888e44 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -19,6 +19,7 @@ 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('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'), array('create-partitions', '', 0, 1, 0, 0, 'bool', 'Create required partition tables and triggers'), array('load-data', '', 0, 1, 0, 0, 'bool', 'Copy data to live tables from import table'), @@ -29,6 +30,8 @@ array('osmosis-init-date', '', 0, 1, 1, 1, 'string', 'Generate default osmosis configuration'), array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'), array('index-output', '', 0, 1, 1, 1, 'string', 'File to dump index information to'), + 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'), ); getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true); @@ -56,6 +59,8 @@ $aCMDResult['osmosis-init-date'] = date('Y-m-d', $iTime).'T22:00:00Z'; } } + $aDSNInfo = DB::parseDSN(CONST_Database_DSN); + if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; if ($aCMDResult['create-db'] || $aCMDResult['all']) { @@ -64,9 +69,9 @@ $oDB =& DB::connect(CONST_Database_DSN, false); if (!PEAR::isError($oDB)) { - fail('database already exists'); + fail('database already exists ('.CONST_Database_DSN.')'); } - passthru('createdb nominatim'); + passthru('createdb '.$aDSNInfo['database']); } if ($aCMDResult['create-db'] || $aCMDResult['all']) @@ -76,9 +81,13 @@ // TODO: path detection, detection memory, etc. $oDB =& getDB(); - passthru('createlang plpgsql nominatim'); - pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/_int.sql'); - pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql'); + passthru('createlang plpgsql '.$aDSNInfo['database']); + $pgver = (float) CONST_Postgresql_Version; + if ($pgver < 9.1) { + pgsqlRunScriptFile(CONST_Path_Postgresql_Contrib.'/hstore.sql'); + } else { + pgsqlRunScript('CREATE EXTENSION hstore'); + } pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql'); pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql'); pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql'); @@ -96,8 +105,9 @@ echo "Import\n"; $bDidSomething = true; - if (!file_exists(CONST_BasePath.'/osm2pgsql/osm2pgsql')) fail("please download and build osm2pgsql"); - passthru(CONST_BasePath.'/osm2pgsql/osm2pgsql -lsc -O gazetteer -C 10000 --hstore -d nominatim '.$aCMDResult['osm-file']); + $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']); $oDB =& getDB(); $x = $oDB->getRow('select * from place limit 1'); @@ -114,6 +124,36 @@ pgsqlRunScript($sTemplate); } + if ($aCMDResult['create-minimal-tables']) + { + echo "Minimal Tables\n"; + $bDidSomething = true; + pgsqlRunScriptFile(CONST_BasePath.'/sql/tables-minimal.sql'); + + $sScript = ''; + + // Backstop the import process - easliest possible import id + $sScript .= "insert into import_npi_log values (18022);\n"; + + $hFile = @fopen(CONST_BasePath.'/settings/partitionedtags.def', "r"); + if (!$hFile) fail('unable to open list of partitions: '.CONST_BasePath.'/settings/partitionedtags.def'); + + while (($sLine = fgets($hFile, 4096)) !== false && $sLine && substr($sLine,0,1) !='#') + { + list($sClass, $sType) = explode(' ', trim($sLine)); + $sScript .= "create table place_classtype_".$sClass."_".$sType." as "; + $sScript .= "select place_id as place_id,geometry as centroid from placex limit 0;\n"; + + $sScript .= "CREATE INDEX idx_place_classtype_".$sClass."_".$sType."_centroid "; + $sScript .= "ON place_classtype_".$sClass."_".$sType." USING GIST (centroid);\n"; + + $sScript .= "CREATE INDEX idx_place_classtype_".$sClass."_".$sType."_place_id "; + $sScript .= "ON place_classtype_".$sClass."_".$sType." USING btree(place_id);\n"; + } + fclose($hFile); + pgsqlRunScript($sScript); + } + if ($aCMDResult['create-tables'] || $aCMDResult['all']) { echo "Tables\n"; @@ -130,13 +170,9 @@ { echo "Partitions\n"; $bDidSomething = true; -echo "here"; $oDB =& getDB(); -echo "there"; $sSQL = 'select partition from country_name order by country_code'; -var_dump($sSQL); $aPartitions = $oDB->getCol($sSQL); -var_dump($aPartitions); if (PEAR::isError($aPartitions)) { fail($aPartitions->getMessage()); @@ -147,11 +183,9 @@ var_dump($aPartitions); preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER); foreach($aMatches as $aMatch) { -var_dump($aMatch); $sResult = ''; foreach($aPartitions as $sPartitionName) { -var_dump($sPartitionName); $sResult .= str_replace('-partition-', $sPartitionName, $aMatch[1]); } $sTemplate = str_replace($aMatch[0], $sResult, $sTemplate); @@ -207,6 +241,8 @@ var_dump($sPartitionName); echo '.'; } echo "\n"; + echo "Reanalysing database...\n"; + pgsqlRunScript('ANALYSE'); } if ($aCMDResult['create-roads']) @@ -248,7 +284,7 @@ var_dump($sPartitionName); $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"); @@ -294,6 +330,7 @@ var_dump($sPartitionName); if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) { + $bDidSomething = true; $oDB =& getDB(); if (!pg_query($oDB->connection, 'DELETE from placex where osm_type=\'P\'')) fail(pg_last_error($oDB->connection)); $sSQL = "insert into placex (osm_type,osm_id,class,type,postcode,country_code,geometry) "; @@ -313,9 +350,9 @@ var_dump($sPartitionName); { $bDidSomething = true; - if (!file_exists(CONST_BasePath.'/osmosis-0.38/bin/osmosis')) fail("please download osmosis"); + 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_BasePath.'/osmosis-0.38/bin/osmosis --read-replication-interval-init '.CONST_BasePath.'/settings'); + 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; @@ -330,7 +367,54 @@ var_dump($sPartitionName); $bDidSomething = true; $sOutputFile = ''; if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output']; - passthru(CONST_BasePath.'/nominatim/nominatim -i -d nominatim -t '.$iInstances.$sOutputFile); + $sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile; + passthru($sBaseCmd.' -R 4'); + pgsqlRunScript('ANALYSE'); + passthru($sBaseCmd.' -r 5 -R 25'); + pgsqlRunScript('ANALYSE'); + passthru($sBaseCmd.' -r 26'); + } + + if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) + { + echo "Search indices\n"; + $bDidSomething = true; + $oDB =& getDB(); + $sSQL = 'select partition from country_name order by country_code'; + $aPartitions = $oDB->getCol($sSQL); + if (PEAR::isError($aPartitions)) + { + fail($aPartitions->getMessage()); + } + $aPartitions[] = 0; + + $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.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); + } + + if (isset($aCMDResult['create-website'])) + { + $bDidSomething = true; + $sTargetDir = $aCMDResult['create-website']; + if (!is_dir($sTargetDir)) fail('please specify a directory to setup'); + @symlink(CONST_BasePath.'/website/details.php', $sTargetDir.'/details.php'); + @symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php'); + @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php'); + @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/index.php'); + @symlink(CONST_BasePath.'/website/images', $sTargetDir.'/images'); + @symlink(CONST_BasePath.'/website/js', $sTargetDir.'/js'); + echo "Symlinks created\n"; } if (!$bDidSomething) @@ -371,26 +455,22 @@ var_dump($sPartitionName); { // Convert database DSN to psql paramaters $aDSNInfo = DB::parseDSN(CONST_Database_DSN); - $sCMD = 'psql '.$aDSNInfo['database']; - + if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432; + $sCMD = 'psql -p '.$aDSNInfo['port'].' '.$aDSNInfo['database']; $aDescriptors = array( 0 => array('pipe', 'r'), - 1 => array('pipe', 'w'), - 2 => array('file', '/dev/null', 'a') + 1 => STDOUT, + 2 => STDERR ); $ahPipes = null; - $hProcess = proc_open($sCMD, $aDescriptors, $ahPipes); + $hProcess = @proc_open($sCMD, $aDescriptors, $ahPipes); if (!is_resource($hProcess)) fail('unable to start pgsql'); - fwrite($ahPipes[0], $sScript); - fclose($ahPipes[0]); - - // TODO: error checking - while(!feof($ahPipes[1])) + while(strlen($sScript)) { - echo fread($ahPipes[1], 4096); + $written = fwrite($ahPipes[0], $sScript); + $sScript = substr($sScript, $written); } - fclose($ahPipes[1]); - + fclose($ahPipes[0]); proc_close($hProcess); }