X-Git-Url: https://git.openstreetmap.org/nominatim.git/blobdiff_plain/38874233816367831c5c30cea0db16d48a3d7016..65500927c2955860d392f76fa9b2c318ccd716d2:/utils/setup.php diff --git a/utils/setup.php b/utils/setup.php index cb544f4c..e4e91674 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -38,6 +38,7 @@ $aCMDOptions 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-country-names', '', 0, 1, 0, 0, 'bool', 'Create default list of searchable country names'), 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,8 +95,9 @@ if ($aCMDResult['create-db'] || $aCMDResult['all']) { if ($aCMDResult['setup-db'] || $aCMDResult['all']) { echo "Setup DB\n"; $bDidSomething = true; - // TODO: path detection, detection memory, etc. + // TODO: path detection, detection memory, etc. + // $oDB =& getDB(); $fPostgresVersion = getPostgresVersion($oDB); @@ -122,8 +124,12 @@ if ($aCMDResult['setup-db'] || $aCMDResult['all']) { echo 'Postgis version found: '.$fPostgisVersion."\n"; if ($fPostgisVersion < 2.1) { - // Function was renamed in 2.1 and throws an annoying deprecation warning + // Functions were renamed in 2.1 and throw an annoying deprecation warning pgsqlRunScript('ALTER FUNCTION st_line_interpolate_point(geometry, double precision) RENAME TO ST_LineInterpolatePoint'); + pgsqlRunScript('ALTER FUNCTION ST_Line_Locate_Point(geometry, geometry) RENAME TO ST_LineLocatePoint'); + } + if ($fPostgisVersion < 2.2) { + pgsqlRunScript('ALTER FUNCTION ST_Distance_Spheroid(geometry, geometry, spheroid) RENAME TO ST_DistanceSpheroid'); } pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql'); @@ -157,7 +163,8 @@ if ($aCMDResult['import-data'] || $aCMDResult['all']) { $osm2pgsql = CONST_Osm2pgsql_Binary; if (!file_exists($osm2pgsql)) { - echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n"; + echo "Check CONST_Osm2pgsql_Binary in your local settings file.\n"; + echo "Normally you should not need to set this manually.\n"; fail("osm2pgsql not found in '$osm2pgsql'"); } @@ -197,18 +204,36 @@ if ($aCMDResult['create-tables'] || $aCMDResult['all']) { echo "Tables\n"; $sTemplate = file_get_contents(CONST_BasePath.'/sql/tables.sql'); $sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate); - $sTemplate = replace_tablespace('{ts:address-data}', - CONST_Tablespace_Address_Data, $sTemplate); - $sTemplate = replace_tablespace('{ts:address-index}', - CONST_Tablespace_Address_Index, $sTemplate); - $sTemplate = replace_tablespace('{ts:search-data}', - CONST_Tablespace_Search_Data, $sTemplate); - $sTemplate = replace_tablespace('{ts:search-index}', - CONST_Tablespace_Search_Index, $sTemplate); - $sTemplate = replace_tablespace('{ts:aux-data}', - CONST_Tablespace_Aux_Data, $sTemplate); - $sTemplate = replace_tablespace('{ts:aux-index}', - CONST_Tablespace_Aux_Index, $sTemplate); + $sTemplate = replace_tablespace( + '{ts:address-data}', + CONST_Tablespace_Address_Data, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:address-index}', + CONST_Tablespace_Address_Index, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:search-data}', + CONST_Tablespace_Search_Data, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:search-index}', + CONST_Tablespace_Search_Index, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:aux-data}', + CONST_Tablespace_Aux_Data, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:aux-index}', + CONST_Tablespace_Aux_Index, + $sTemplate + ); pgsqlRunScript($sTemplate, false); // re-run the functions @@ -221,18 +246,36 @@ if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) { $bDidSomething = true; $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql'); - $sTemplate = replace_tablespace('{ts:address-data}', - CONST_Tablespace_Address_Data, $sTemplate); - $sTemplate = replace_tablespace('{ts:address-index}', - CONST_Tablespace_Address_Index, $sTemplate); - $sTemplate = replace_tablespace('{ts:search-data}', - CONST_Tablespace_Search_Data, $sTemplate); - $sTemplate = replace_tablespace('{ts:search-index}', - CONST_Tablespace_Search_Index, $sTemplate); - $sTemplate = replace_tablespace('{ts:aux-data}', - CONST_Tablespace_Aux_Data, $sTemplate); - $sTemplate = replace_tablespace('{ts:aux-index}', - CONST_Tablespace_Aux_Index, $sTemplate); + $sTemplate = replace_tablespace( + '{ts:address-data}', + CONST_Tablespace_Address_Data, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:address-index}', + CONST_Tablespace_Address_Index, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:search-data}', + CONST_Tablespace_Search_Data, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:search-index}', + CONST_Tablespace_Search_Index, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:aux-data}', + CONST_Tablespace_Aux_Data, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:aux-index}', + CONST_Tablespace_Aux_Index, + $sTemplate + ); pgsqlRunPartitionScript($sTemplate); } @@ -249,8 +292,8 @@ if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) { if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) { $bDidSomething = true; - $sWikiArticlesFile = CONST_BasePath.'/data/wikipedia_article.sql.bin'; - $sWikiRedirectsFile = CONST_BasePath.'/data/wikipedia_redirect.sql.bin'; + $sWikiArticlesFile = CONST_Wikipedia_Data_Path.'/wikipedia_article.sql.bin'; + $sWikiRedirectsFile = CONST_Wikipedia_Data_Path.'/wikipedia_redirect.sql.bin'; if (file_exists($sWikiArticlesFile)) { echo "Importing wikipedia articles..."; pgsqlRunDropAndRestore($sWikiArticlesFile); @@ -303,7 +346,11 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) { } // used by getorcreate_word_id to ignore frequent partial words - if (!pg_query($oDB->connection, 'CREATE OR REPLACE FUNCTION get_maxwordfreq() RETURNS integer AS $$ SELECT '.CONST_Max_Word_Frequency.' as maxwordfreq; $$ LANGUAGE SQL IMMUTABLE')) fail(pg_last_error($oDB->connection)); + $sSQL = 'CREATE OR REPLACE FUNCTION get_maxwordfreq() RETURNS integer AS '; + $sSQL .= '$$ SELECT '.CONST_Max_Word_Frequency.' as maxwordfreq; $$ LANGUAGE SQL IMMUTABLE'; + if (!pg_query($oDB->connection, $sSQL)) { + fail(pg_last_error($oDB->connection)); + } echo ".\n"; // pre-create the word list @@ -351,10 +398,16 @@ if ($aCMDResult['import-tiger-data']) { $sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_start.sql'); $sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate); - $sTemplate = replace_tablespace('{ts:aux-data}', - CONST_Tablespace_Aux_Data, $sTemplate); - $sTemplate = replace_tablespace('{ts:aux-index}', - CONST_Tablespace_Aux_Index, $sTemplate); + $sTemplate = replace_tablespace( + '{ts:aux-data}', + CONST_Tablespace_Aux_Data, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:aux-index}', + CONST_Tablespace_Aux_Index, + $sTemplate + ); pgsqlRunScript($sTemplate, false); $aDBInstances = array(); @@ -401,10 +454,16 @@ if ($aCMDResult['import-tiger-data']) { echo "Creating indexes\n"; $sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_finish.sql'); $sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate); - $sTemplate = replace_tablespace('{ts:aux-data}', - CONST_Tablespace_Aux_Data, $sTemplate); - $sTemplate = replace_tablespace('{ts:aux-index}', - CONST_Tablespace_Aux_Index, $sTemplate); + $sTemplate = replace_tablespace( + '{ts:aux-data}', + CONST_Tablespace_Aux_Data, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:aux-index}', + CONST_Tablespace_Aux_Index, + $sTemplate + ); pgsqlRunScript($sTemplate, false); } @@ -522,16 +581,51 @@ if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) { $bDidSomething = true; $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql'); - $sTemplate = replace_tablespace('{ts:address-index}', - CONST_Tablespace_Address_Index, $sTemplate); - $sTemplate = replace_tablespace('{ts:search-index}', - CONST_Tablespace_Search_Index, $sTemplate); - $sTemplate = replace_tablespace('{ts:aux-index}', - CONST_Tablespace_Aux_Index, $sTemplate); + $sTemplate = replace_tablespace( + '{ts:address-index}', + CONST_Tablespace_Address_Index, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:search-index}', + CONST_Tablespace_Search_Index, + $sTemplate + ); + $sTemplate = replace_tablespace( + '{ts:aux-index}', + CONST_Tablespace_Aux_Index, + $sTemplate + ); pgsqlRunScript($sTemplate); } +if ($aCMDResult['create-country-names'] || $aCMDResult['all']) { + echo 'Creating search index for default country names'; + $bDidSomething = true; + + pgsqlRunScript("select getorcreate_country(make_standard_name('uk'), 'gb')"); + pgsqlRunScript("select getorcreate_country(make_standard_name('united states'), 'us')"); + pgsqlRunScript("select count(*) from (select getorcreate_country(make_standard_name(country_code), country_code) from country_name where country_code is not null) as x"); + pgsqlRunScript("select count(*) from (select getorcreate_country(make_standard_name(name->'name'), country_code) from country_name where name ? 'name') as x"); + + $sSQL = 'select count(*) from (select getorcreate_country(make_standard_name(v), country_code) from (select country_code, skeys(name) as k, svals(name) as v from country_name) x where k '; + if (CONST_Languages) { + $sSQL .= 'in '; + $sDelim = '('; + foreach (explode(',', CONST_Languages) as $sLang) { + $sSQL .= $sDelim."'name:$sLang'"; + $sDelim = ','; + } + $sSQL .= ')'; + } else { + // all include all simple name tags + $sSQL .= "like 'name:%'"; + } + $sSQL .= ') v'; + pgsqlRunScript($sSQL); +} + if ($aCMDResult['drop']) { // The implementation is potentially a bit dangerous because it uses // a positive selection of tables to keep, and deletes everything else. @@ -592,6 +686,7 @@ if (!$bDidSomething) { echo "Setup finished.\n"; } + function pgsqlRunScriptFile($sFilename) { if (!file_exists($sFilename)) fail('unable to find '.$sFilename); @@ -641,7 +736,6 @@ function pgsqlRunScriptFile($sFilename) fclose($ahGzipPipes[1]); proc_close($hGzipProcess); } - } function pgsqlRunScript($sScript, $bfatal = true) @@ -655,7 +749,7 @@ function pgsqlRunScript($sScript, $bfatal = true) $sCMD .= ' -v ON_ERROR_STOP=1'; $aDescriptors = array( 0 => array('pipe', 'r'), - 1 => STDOUT, + 1 => STDOUT, 2 => STDERR ); $ahPipes = null; @@ -759,8 +853,7 @@ function passthruCheckReturn($cmd) function replace_tablespace($sTemplate, $sTablespace, $sSql) { if ($sTablespace) { - $sSql = str_replace($sTemplate, 'TABLESPACE "'.$sTablespace.'"', - $sSql); + $sSql = str_replace($sTemplate, 'TABLESPACE "'.$sTablespace.'"', $sSql); } else { $sSql = str_replace($sTemplate, '', $sSql); } @@ -788,6 +881,4 @@ function create_sql_functions($aCMDResult) $sTemplate = str_replace('-- %NOAUXDATA% ', '', $sTemplate); } pgsqlRunScript($sTemplate); - } -