namespace Nominatim\Setup;
+require_once(CONST_BasePath.'/lib/setup/AddressLevelParser.php');
+
class SetupFunctions
{
- protected $iCacheMemory; // set in constructor
- protected $iInstances; // set in constructor
- protected $sModulePath; // set in constructor
- protected $aDSNInfo; // set in constructor = DB::parseDSN(CONST_Database_DSN);
- protected $sVerbose; // set in constructor
- protected $sIgnoreErrors; // set in constructor
- protected $bEnableDiffUpdates; // set in constructor
- protected $bEnableDebugStatements; // set in constructor
- protected $bNoPartitions; // set in constructor
- protected $oDB = null; // set in setupDB (earliest) or later in loadData, importData, drop, createSqlFunctions, importTigerData
- // pgsqlRunPartitionScript, calculatePostcodes, ..if no already set
+ protected $iCacheMemory;
+ protected $iInstances;
+ protected $sModulePath;
+ protected $aDSNInfo;
+ protected $bVerbose;
+ protected $sIgnoreErrors;
+ protected $bEnableDiffUpdates;
+ protected $bEnableDebugStatements;
+ protected $bNoPartitions;
+ protected $oDB = null;
public function __construct(array $aCMDResult)
{
$this->sModulePath = CONST_Database_Module_Path;
info('module path: ' . $this->sModulePath);
- // prepares DB for import or update, sets the Data Source Name
- $this->aDSNInfo = \DB::parseDSN(CONST_Database_DSN);
- if (!isset($this->aDSNInfo['port']) || !$this->aDSNInfo['port']) $this->aDSNInfo['port'] = 5432;
+ // parse database string
+ $this->aDSNInfo = \Nominatim\DB::parseDSN(CONST_Database_DSN);
+ if (!isset($this->aDSNInfo['port'])) {
+ $this->aDSNInfo['port'] = 5432;
+ }
// setting member variables based on command line options stored in $aCMDResult
- $this->sVerbose = $aCMDResult['verbose'];
+ $this->bVerbose = $aCMDResult['verbose'];
//setting default values which are not set by the update.php array
if (isset($aCMDResult['ignore-errors'])) {
public function createDB()
{
info('Create DB');
- $sDB = \DB::connect(CONST_Database_DSN, false);
- if (!\PEAR::isError($sDB)) {
- fail('database already exists ('.CONST_Database_DSN.')');
- }
+ $oDB = new \Nominatim\DB;
- $sCreateDBCmd = 'createdb -E UTF-8 -p '.$this->aDSNInfo['port'].' '.$this->aDSNInfo['database'];
- if (isset($this->aDSNInfo['username']) && $this->aDSNInfo['username']) {
- $sCreateDBCmd .= ' -U '.$this->aDSNInfo['username'];
+ if ($oDB->databaseExists()) {
+ fail('database already exists ('.CONST_Database_DSN.')');
}
- if (isset($this->aDSNInfo['hostspec']) && $this->aDSNInfo['hostspec']) {
- $sCreateDBCmd .= ' -h '.$this->aDSNInfo['hostspec'];
+ $sCreateDBCmd = 'createdb -E UTF-8'
+ .' -p '.escapeshellarg($this->aDSNInfo['port'])
+ .' '.escapeshellarg($this->aDSNInfo['database']);
+ if (isset($this->aDSNInfo['username'])) {
+ $sCreateDBCmd .= ' -U '.escapeshellarg($this->aDSNInfo['username']);
}
- $aProcEnv = null;
- if (isset($this->aDSNInfo['password']) && $this->aDSNInfo['password']) {
- $aProcEnv = array_merge(array('PGPASSWORD' => $this->aDSNInfo['password']), $_ENV);
+ if (isset($this->aDSNInfo['hostspec'])) {
+ $sCreateDBCmd .= ' -h '.escapeshellarg($this->aDSNInfo['hostspec']);
}
- $result = runWithEnv($sCreateDBCmd, $aProcEnv);
+ $result = $this->runWithPgEnv($sCreateDBCmd);
if ($result != 0) fail('Error executing external command: '.$sCreateDBCmd);
}
+ public function connect()
+ {
+ $this->oDB = new \Nominatim\DB();
+ $this->oDB->connect();
+ }
+
public function setupDB()
{
info('Setup DB');
- $this->oDB =& getDB();
- $fPostgresVersion = getPostgresVersion($this->oDB);
+ $fPostgresVersion = $this->oDB->getPostgresVersion();
echo 'Postgres version found: '.$fPostgresVersion."\n";
- if ($fPostgresVersion < 9.1) {
- fail('Minimum supported version of Postgresql is 9.1.');
+ if ($fPostgresVersion < 9.03) {
+ fail('Minimum supported version of Postgresql is 9.3.');
}
$this->pgsqlRunScript('CREATE EXTENSION IF NOT EXISTS hstore');
$this->pgsqlRunScript('CREATE EXTENSION IF NOT EXISTS postgis');
- // 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 = chksql($this->oDB->getOne("select count(*) from pg_proc where proname = 'hstore_to_json'"));
-
- if ($iNumFunc == 0) {
- $this->pgsqlRunScript("create function hstore_to_json(dummy hstore) returns text AS 'select null::text' language sql immutable");
- warn('Postgresql is too old. extratags and namedetails API not available.');
- }
-
-
- $fPostgisVersion = getPostgisVersion($this->oDB);
+ $fPostgisVersion = $this->oDB->getPostgisVersion();
echo 'Postgis version found: '.$fPostgisVersion."\n";
- if ($fPostgisVersion < 2.1) {
- // Functions were renamed in 2.1 and throw an annoying deprecation warning
- $this->pgsqlRunScript('ALTER FUNCTION st_line_interpolate_point(geometry, double precision) RENAME TO ST_LineInterpolatePoint');
- $this->pgsqlRunScript('ALTER FUNCTION ST_Line_Locate_Point(geometry, geometry) RENAME TO ST_LineLocatePoint');
- }
if ($fPostgisVersion < 2.2) {
- $this->pgsqlRunScript('ALTER FUNCTION ST_Distance_Spheroid(geometry, geometry, spheroid) RENAME TO ST_DistanceSpheroid');
+ echo "Minimum required Postgis version 2.2\n";
+ exit(1);
}
- $i = chksql($this->oDB->getOne("select count(*) from pg_user where usename = '".CONST_Database_Web_User."'"));
+ $i = $this->oDB->getOne("select count(*) from pg_user where usename = '".CONST_Database_Web_User."'");
if ($i == 0) {
echo "\nERROR: Web user '".CONST_Database_Web_User."' does not exist. Create it with:\n";
echo "\n createuser ".CONST_Database_Web_User."\n\n";
}
// Try accessing the C module, so we know early if something is wrong
- if (!checkModulePresence()) {
- fail('error loading nominatim.so module');
- }
+ checkModulePresence(); // raises exception on failure
if (!file_exists(CONST_ExtraDataPath.'/country_osm_grid.sql.gz')) {
echo 'Error: you need to download the country_osm_grid first:';
exit(1);
}
$this->pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
- $this->pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
- $this->pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql.gz');
+ $this->pgsqlRunScriptFile(CONST_ExtraDataPath.'/country_osm_grid.sql.gz');
$this->pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_table.sql');
+ $this->pgsqlRunScriptFile(CONST_BasePath.'/data/us_postcode_table.sql');
$sPostcodeFilename = CONST_BasePath.'/data/gb_postcode_data.sql.gz';
if (file_exists($sPostcodeFilename)) {
$this->pgsqlRunScriptFile($sPostcodeFilename);
} else {
- warn('optional external UK postcode table file ('.$sPostcodeFilename.') not found. Skipping.');
+ warn('optional external GB postcode table file ('.$sPostcodeFilename.') not found. Skipping.');
}
- if (CONST_Use_Extra_US_Postcodes) {
- $this->pgsqlRunScriptFile(CONST_BasePath.'/data/us_postcode.sql');
+ $sPostcodeFilename = CONST_BasePath.'/data/us_postcode_data.sql.gz';
+ if (file_exists($sPostcodeFilename)) {
+ $this->pgsqlRunScriptFile($sPostcodeFilename);
+ } else {
+ warn('optional external US postcode table file ('.$sPostcodeFilename.') not found. Skipping.');
}
if ($this->bNoPartitions) {
$this->pgsqlRunScript('update country_name set partition = 0');
}
-
- // the following will be needed by createFunctions later but
- // is only defined in the subsequently called createTables
- // Create dummies here that will be overwritten by the proper
- // versions in create-tables.
- $this->pgsqlRunScript('CREATE TABLE IF NOT EXISTS place_boundingbox ()');
- $this->pgsqlRunScript('CREATE TYPE wikipedia_article_match AS ()', false);
}
public function importData($sOSMFile)
fail("osm2pgsql not found in '$osm2pgsql'");
}
+ $osm2pgsql .= ' -S '.escapeshellarg(CONST_Import_Style);
+
if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
- $osm2pgsql .= ' --flat-nodes '.CONST_Osm2pgsql_Flatnode_File;
+ $osm2pgsql .= ' --flat-nodes '.escapeshellarg(CONST_Osm2pgsql_Flatnode_File);
}
if (CONST_Tablespace_Osm2pgsql_Data)
- $osm2pgsql .= ' --tablespace-slim-data '.CONST_Tablespace_Osm2pgsql_Data;
+ $osm2pgsql .= ' --tablespace-slim-data '.escapeshellarg(CONST_Tablespace_Osm2pgsql_Data);
if (CONST_Tablespace_Osm2pgsql_Index)
- $osm2pgsql .= ' --tablespace-slim-index '.CONST_Tablespace_Osm2pgsql_Index;
+ $osm2pgsql .= ' --tablespace-slim-index '.escapeshellarg(CONST_Tablespace_Osm2pgsql_Index);
if (CONST_Tablespace_Place_Data)
- $osm2pgsql .= ' --tablespace-main-data '.CONST_Tablespace_Place_Data;
+ $osm2pgsql .= ' --tablespace-main-data '.escapeshellarg(CONST_Tablespace_Place_Data);
if (CONST_Tablespace_Place_Index)
- $osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
+ $osm2pgsql .= ' --tablespace-main-index '.escapeshellarg(CONST_Tablespace_Place_Index);
$osm2pgsql .= ' -lsc -O gazetteer --hstore --number-processes 1';
- $osm2pgsql .= ' -C '.$this->iCacheMemory;
- $osm2pgsql .= ' -P '.$this->aDSNInfo['port'];
- if (isset($this->aDSNInfo['username']) && $this->aDSNInfo['username']) {
- $osm2pgsql .= ' -U '.$this->aDSNInfo['username'];
+ $osm2pgsql .= ' -C '.escapeshellarg($this->iCacheMemory);
+ $osm2pgsql .= ' -P '.escapeshellarg($this->aDSNInfo['port']);
+ if (isset($this->aDSNInfo['username'])) {
+ $osm2pgsql .= ' -U '.escapeshellarg($this->aDSNInfo['username']);
}
- if (isset($this->aDSNInfo['hostspec']) && $this->aDSNInfo['hostspec']) {
- $osm2pgsql .= ' -H '.$this->aDSNInfo['hostspec'];
- }
- $aProcEnv = null;
- if (isset($this->aDSNInfo['password']) && $this->aDSNInfo['password']) {
- $aProcEnv = array_merge(array('PGPASSWORD' => $this->aDSNInfo['password']), $_ENV);
+ if (isset($this->aDSNInfo['hostspec'])) {
+ $osm2pgsql .= ' -H '.escapeshellarg($this->aDSNInfo['hostspec']);
}
- $osm2pgsql .= ' -d '.$this->aDSNInfo['database'].' '.$sOSMFile;
- runWithEnv($osm2pgsql, $aProcEnv);
- if ($this->oDB == null) $this->oDB =& getDB();
- if (!$this->sIgnoreErrors && !chksql($this->oDB->getRow('select * from place limit 1'))) {
+ $osm2pgsql .= ' -d '.escapeshellarg($this->aDSNInfo['database']).' '.escapeshellarg($sOSMFile);
+
+ $this->runWithPgEnv($osm2pgsql);
+
+ if (!$this->sIgnoreErrors && !$this->oDB->getRow('select * from place limit 1')) {
fail('No Data');
}
}
{
info('Create Functions');
- // Try accessing the C module, so we know eif something is wrong
- // update.php calls this function
- if (!checkModulePresence()) {
- fail('error loading nominatim.so module');
- }
+ // Try accessing the C module, so we know early if something is wrong
+ checkModulePresence(); // raises exception on failure
+
$this->createSqlFunctions();
}
- public function createTables()
+ public function createTables($bReverseOnly = false)
{
info('Create Tables');
);
$this->pgsqlRunScript($sTemplate, false);
+
+ if ($bReverseOnly) {
+ $this->pgExec('DROP TABLE search_name');
+ }
+
+ $oAlParser = new AddressLevelParser(CONST_Address_Level_Config);
+ $oAlParser->createTable($this->oDB, 'address_levels');
}
public function createPartitionTables()
public function importWikipediaArticles()
{
- $sWikiArticlesFile = CONST_Wikipedia_Data_Path.'/wikipedia_article.sql.bin';
- $sWikiRedirectsFile = CONST_Wikipedia_Data_Path.'/wikipedia_redirect.sql.bin';
+ $sWikiArticlesFile = CONST_Wikipedia_Data_Path.'/wikimedia-importance.sql.gz';
if (file_exists($sWikiArticlesFile)) {
- info('Importing wikipedia articles');
- $this->pgsqlRunDropAndRestore($sWikiArticlesFile);
- } else {
- warn('wikipedia article dump file not found - places will have default importance');
- }
- if (file_exists($sWikiRedirectsFile)) {
- info('Importing wikipedia redirects');
- $this->pgsqlRunDropAndRestore($sWikiRedirectsFile);
+ info('Importing wikipedia articles and redirects');
+ $this->pgExec('DROP TABLE IF EXISTS wikipedia_article');
+ $this->pgExec('DROP TABLE IF EXISTS wikipedia_redirect');
+ $this->pgsqlRunScriptFile($sWikiArticlesFile);
} else {
- warn('wikipedia redirect dump file not found - some place importance values may be missing');
+ warn('wikipedia importance dump file not found - places will have default importance');
}
}
{
info('Drop old Data');
- if ($this->oDB == null) $this->oDB =& getDB();
-
- if (!pg_query($this->oDB->connection, 'TRUNCATE word')) fail(pg_last_error($this->oDB->connection));
- echo '.';
- if (!pg_query($this->oDB->connection, 'TRUNCATE placex')) fail(pg_last_error($this->oDB->connection));
- echo '.';
- if (!pg_query($this->oDB->connection, 'TRUNCATE location_property_osmline')) fail(pg_last_error($this->oDB->connection));
+ $this->pgExec('TRUNCATE word');
echo '.';
- if (!pg_query($this->oDB->connection, 'TRUNCATE place_addressline')) fail(pg_last_error($this->oDB->connection));
+ $this->pgExec('TRUNCATE placex');
echo '.';
- if (!pg_query($this->oDB->connection, 'TRUNCATE place_boundingbox')) fail(pg_last_error($this->oDB->connection));
+ $this->pgExec('TRUNCATE location_property_osmline');
echo '.';
- if (!pg_query($this->oDB->connection, 'TRUNCATE location_area')) fail(pg_last_error($this->oDB->connection));
+ $this->pgExec('TRUNCATE place_addressline');
echo '.';
- if (!pg_query($this->oDB->connection, 'TRUNCATE search_name')) fail(pg_last_error($this->oDB->connection));
+ $this->pgExec('TRUNCATE location_area');
echo '.';
- if (!pg_query($this->oDB->connection, 'TRUNCATE search_name_blank')) fail(pg_last_error($this->oDB->connection));
+ if (!$this->dbReverseOnly()) {
+ $this->pgExec('TRUNCATE search_name');
+ echo '.';
+ }
+ $this->pgExec('TRUNCATE search_name_blank');
echo '.';
- if (!pg_query($this->oDB->connection, 'DROP SEQUENCE seq_place')) fail(pg_last_error($this->oDB->connection));
+ $this->pgExec('DROP SEQUENCE seq_place');
echo '.';
- if (!pg_query($this->oDB->connection, 'CREATE SEQUENCE seq_place start 100000')) fail(pg_last_error($this->oDB->connection));
+ $this->pgExec('CREATE SEQUENCE seq_place start 100000');
echo '.';
$sSQL = 'select distinct partition from country_name';
- $aPartitions = chksql($this->oDB->getCol($sSQL));
+ $aPartitions = $this->oDB->getCol($sSQL);
+
if (!$this->bNoPartitions) $aPartitions[] = 0;
foreach ($aPartitions as $sPartition) {
- if (!pg_query($this->oDB->connection, 'TRUNCATE location_road_'.$sPartition)) fail(pg_last_error($this->oDB->connection));
+ $this->pgExec('TRUNCATE location_road_'.$sPartition);
echo '.';
}
// used by getorcreate_word_id to ignore frequent partial words
$sSQL = 'CREATE OR REPLACE FUNCTION get_maxwordfreq() RETURNS integer AS ';
$sSQL .= '$$ SELECT '.CONST_Max_Word_Frequency.' as maxwordfreq; $$ LANGUAGE SQL IMMUTABLE';
- if (!pg_query($this->oDB->connection, $sSQL)) {
- fail(pg_last_error($this->oDB->connection));
- }
+ $this->pgExec($sSQL);
echo ".\n";
// pre-create the word list
info('Load Data');
$sColumns = 'osm_type, osm_id, class, type, name, admin_level, address, extratags, geometry';
+
$aDBInstances = array();
$iLoadThreads = max(1, $this->iInstances - 1);
for ($i = 0; $i < $iLoadThreads; $i++) {
- $aDBInstances[$i] =& getDB(true);
+ // https://secure.php.net/manual/en/function.pg-connect.php
+ $DSN = CONST_Database_DSN;
+ $DSN = preg_replace('/^pgsql:/', '', $DSN);
+ $DSN = preg_replace('/;/', ' ', $DSN);
+ $aDBInstances[$i] = pg_connect($DSN, PGSQL_CONNECT_FORCE_NEW);
+ pg_ping($aDBInstances[$i]);
+ }
+
+ for ($i = 0; $i < $iLoadThreads; $i++) {
$sSQL = "INSERT INTO placex ($sColumns) SELECT $sColumns FROM place WHERE osm_id % $iLoadThreads = $i";
$sSQL .= " and not (class='place' and type='houses' and osm_type='W'";
$sSQL .= " and ST_GeometryType(geometry) = 'ST_LineString')";
$sSQL .= ' and ST_IsValid(geometry)';
- if ($this->sVerbose) echo "$sSQL\n";
- if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) {
- fail(pg_last_error($aDBInstances[$i]->connection));
+ if ($this->bVerbose) echo "$sSQL\n";
+ if (!pg_send_query($aDBInstances[$i], $sSQL)) {
+ fail(pg_last_error($aDBInstances[$i]));
}
}
// last thread for interpolation lines
- $aDBInstances[$iLoadThreads] =& getDB(true);
+ // https://secure.php.net/manual/en/function.pg-connect.php
+ $DSN = CONST_Database_DSN;
+ $DSN = preg_replace('/^pgsql:/', '', $DSN);
+ $DSN = preg_replace('/;/', ' ', $DSN);
+ $aDBInstances[$iLoadThreads] = pg_connect($DSN, PGSQL_CONNECT_FORCE_NEW);
+ pg_ping($aDBInstances[$iLoadThreads]);
$sSQL = 'insert into location_property_osmline';
$sSQL .= ' (osm_id, address, linegeo)';
$sSQL .= ' SELECT osm_id, address, geometry from place where ';
$sSQL .= "class='place' and type='houses' and osm_type='W' and ST_GeometryType(geometry) = 'ST_LineString'";
- if ($this->sVerbose) echo "$sSQL\n";
- if (!pg_send_query($aDBInstances[$iLoadThreads]->connection, $sSQL)) {
- fail(pg_last_error($aDBInstances[$iLoadThreads]->connection));
+ if ($this->bVerbose) echo "$sSQL\n";
+ if (!pg_send_query($aDBInstances[$iLoadThreads], $sSQL)) {
+ fail(pg_last_error($aDBInstances[$iLoadThreads]));
}
$bFailed = false;
for ($i = 0; $i <= $iLoadThreads; $i++) {
- while (($hPGresult = pg_get_result($aDBInstances[$i]->connection)) !== false) {
+ while (($hPGresult = pg_get_result($aDBInstances[$i])) !== false) {
$resultStatus = pg_result_status($hPGresult);
// PGSQL_EMPTY_QUERY, PGSQL_COMMAND_OK, PGSQL_TUPLES_OK,
// PGSQL_COPY_OUT, PGSQL_COPY_IN, PGSQL_BAD_RESPONSE,
if ($bFailed) {
fail('SQL errors loading placex and/or location_property_osmline tables');
}
+
+ for ($i = 0; $i < $this->iInstances; $i++) {
+ pg_close($aDBInstances[$i]);
+ }
+
echo "\n";
info('Reanalysing database');
$this->pgsqlRunScript('ANALYSE');
$sDatabaseDate = getDatabaseDate($this->oDB);
- pg_query($this->oDB->connection, 'TRUNCATE import_status');
- if ($sDatabaseDate === false) {
+ $this->oDB->exec('TRUNCATE import_status');
+ if (!$sDatabaseDate) {
warn('could not determine database date.');
} else {
$sSQL = "INSERT INTO import_status (lastimportdate) VALUES('".$sDatabaseDate."')";
- pg_query($this->oDB->connection, $sSQL);
+ $this->oDB->exec($sSQL);
echo "Latest data imported from $sDatabaseDate.\n";
}
}
{
info('Import Tiger data');
+ $aFilenames = glob(CONST_Tiger_Data_Path.'/*.sql');
+ info('Found '.count($aFilenames).' SQL files in path '.CONST_Tiger_Data_Path);
+ if (empty($aFilenames)) return;
+
$sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_start.sql');
$sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate);
$sTemplate = $this->replaceTablespace(
$aDBInstances = array();
for ($i = 0; $i < $this->iInstances; $i++) {
- $aDBInstances[$i] =& getDB(true);
+ // https://secure.php.net/manual/en/function.pg-connect.php
+ $DSN = CONST_Database_DSN;
+ $DSN = preg_replace('/^pgsql:/', '', $DSN);
+ $DSN = preg_replace('/;/', ' ', $DSN);
+ $aDBInstances[$i] = pg_connect($DSN, PGSQL_CONNECT_FORCE_NEW | PGSQL_CONNECT_ASYNC);
+ pg_ping($aDBInstances[$i]);
}
- foreach (glob(CONST_Tiger_Data_Path.'/*.sql') as $sFile) {
+ foreach ($aFilenames as $sFile) {
echo $sFile.': ';
$hFile = fopen($sFile, 'r');
$sSQL = fgets($hFile, 100000);
$iLines = 0;
while (true) {
for ($i = 0; $i < $this->iInstances; $i++) {
- if (!pg_connection_busy($aDBInstances[$i]->connection)) {
- while (pg_get_result($aDBInstances[$i]->connection));
+ if (!pg_connection_busy($aDBInstances[$i])) {
+ while (pg_get_result($aDBInstances[$i]));
$sSQL = fgets($hFile, 100000);
if (!$sSQL) break 2;
- if (!pg_send_query($aDBInstances[$i]->connection, $sSQL)) fail(pg_last_error($this->oDB->connection));
+ if (!pg_send_query($aDBInstances[$i], $sSQL)) fail(pg_last_error($aDBInstances[$i]));
$iLines++;
if ($iLines == 1000) {
echo '.';
while ($bAnyBusy) {
$bAnyBusy = false;
for ($i = 0; $i < $this->iInstances; $i++) {
- if (pg_connection_busy($aDBInstances[$i]->connection)) $bAnyBusy = true;
+ if (pg_connection_busy($aDBInstances[$i])) $bAnyBusy = true;
}
usleep(10);
}
echo "\n";
}
+ for ($i = 0; $i < $this->iInstances; $i++) {
+ pg_close($aDBInstances[$i]);
+ }
+
info('Creating indexes on Tiger data');
$sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_finish.sql');
$sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate);
public function calculatePostcodes($bCMDResultAll)
{
info('Calculate Postcodes');
- if ($this->oDB == null) $this->oDB =& getDB();
- if (!pg_query($this->oDB->connection, 'TRUNCATE location_postcode')) {
- fail(pg_last_error($this->oDB->connection));
- }
-
+ $this->pgExec('TRUNCATE location_postcode');
$sSQL = 'INSERT INTO location_postcode';
$sSQL .= ' (place_id, indexed_status, country_code, postcode, geometry) ';
$sSQL .= " WHERE address ? 'postcode' AND address->'postcode' NOT SIMILAR TO '%(,|;)%'";
$sSQL .= ' AND geometry IS NOT null';
$sSQL .= ' GROUP BY country_code, pc';
+ $this->pgExec($sSQL);
- if (!pg_query($this->oDB->connection, $sSQL)) {
- fail(pg_last_error($this->oDB->connection));
- }
-
- if (CONST_Use_Extra_US_Postcodes) {
- // only add postcodes that are not yet available in OSM
- $sSQL = 'INSERT INTO location_postcode';
- $sSQL .= ' (place_id, indexed_status, country_code, postcode, geometry) ';
- $sSQL .= "SELECT nextval('seq_place'), 1, 'us', postcode,";
- $sSQL .= ' ST_SetSRID(ST_Point(x,y),4326)';
- $sSQL .= ' FROM us_postcode WHERE postcode NOT IN';
- $sSQL .= ' (SELECT postcode FROM location_postcode';
- $sSQL .= " WHERE country_code = 'us')";
- if (!pg_query($this->oDB->connection, $sSQL)) fail(pg_last_error($this->oDB->connection));
- }
+ // only add postcodes that are not yet available in OSM
+ $sSQL = 'INSERT INTO location_postcode';
+ $sSQL .= ' (place_id, indexed_status, country_code, postcode, geometry) ';
+ $sSQL .= "SELECT nextval('seq_place'), 1, 'us', postcode,";
+ $sSQL .= ' ST_SetSRID(ST_Point(x,y),4326)';
+ $sSQL .= ' FROM us_postcode WHERE postcode NOT IN';
+ $sSQL .= ' (SELECT postcode FROM location_postcode';
+ $sSQL .= " WHERE country_code = 'us')";
+ $this->pgExec($sSQL);
// add missing postcodes for GB (if available)
$sSQL = 'INSERT INTO location_postcode';
$sSQL .= ' FROM gb_postcode WHERE postcode NOT IN';
$sSQL .= ' (SELECT postcode FROM location_postcode';
$sSQL .= " WHERE country_code = 'gb')";
- if (!pg_query($this->oDB->connection, $sSQL)) fail(pg_last_error($this->oDB->connection));
+ $this->pgExec($sSQL);
if (!$bCMDResultAll) {
$sSQL = "DELETE FROM word WHERE class='place' and type='postcode'";
$sSQL .= 'and word NOT IN (SELECT postcode FROM location_postcode)';
- if (!pg_query($this->oDB->connection, $sSQL)) {
- fail(pg_last_error($this->oDB->connection));
- }
+ $this->pgExec($sSQL);
}
+
$sSQL = 'SELECT count(getorcreate_postcode_id(v)) FROM ';
$sSQL .= '(SELECT distinct(postcode) as v FROM location_postcode) p';
-
- if (!pg_query($this->oDB->connection, $sSQL)) {
- fail(pg_last_error($this->oDB->connection));
- }
+ $this->pgExec($sSQL);
}
public function index($bIndexNoanalyse)
{
$sOutputFile = '';
- $sBaseCmd = CONST_InstallPath.'/nominatim/nominatim -i -d '.$this->aDSNInfo['database'].' -P '
- .$this->aDSNInfo['port'].' -t '.$this->iInstances.$sOutputFile;
- if (isset($this->aDSNInfo['hostspec']) && $this->aDSNInfo['hostspec']) {
- $sBaseCmd .= ' -H '.$this->aDSNInfo['hostspec'];
- }
- if (isset($this->aDSNInfo['username']) && $this->aDSNInfo['username']) {
- $sBaseCmd .= ' -U '.$this->aDSNInfo['username'];
+ $sBaseCmd = CONST_InstallPath.'/nominatim/nominatim -i'
+ .' -d '.escapeshellarg($this->aDSNInfo['database'])
+ .' -P '.escapeshellarg($this->aDSNInfo['port'])
+ .' -t '.escapeshellarg($this->iInstances.$sOutputFile);
+ if (isset($this->aDSNInfo['hostspec'])) {
+ $sBaseCmd .= ' -H '.escapeshellarg($this->aDSNInfo['hostspec']);
}
- $aProcEnv = null;
- if (isset($this->aDSNInfo['password']) && $this->aDSNInfo['password']) {
- $aProcEnv = array_merge(array('PGPASSWORD' => $this->aDSNInfo['password']), $_ENV);
+ if (isset($this->aDSNInfo['username'])) {
+ $sBaseCmd .= ' -U '.escapeshellarg($this->aDSNInfo['username']);
}
info('Index ranks 0 - 4');
- $iStatus = runWithEnv($sBaseCmd.' -R 4', $aProcEnv);
+ $iStatus = $this->runWithPgEnv($sBaseCmd.' -R 4');
if ($iStatus != 0) {
fail('error status ' . $iStatus . ' running nominatim!');
}
if (!$bIndexNoanalyse) $this->pgsqlRunScript('ANALYSE');
+
info('Index ranks 5 - 25');
- $iStatus = runWithEnv($sBaseCmd.' -r 5 -R 25', $aProcEnv);
+ $iStatus = $this->runWithPgEnv($sBaseCmd.' -r 5 -R 25');
if ($iStatus != 0) {
fail('error status ' . $iStatus . ' running nominatim!');
}
if (!$bIndexNoanalyse) $this->pgsqlRunScript('ANALYSE');
+
info('Index ranks 26 - 30');
- $iStatus = runWithEnv($sBaseCmd.' -r 26', $aProcEnv);
+ $iStatus = $this->runWithPgEnv($sBaseCmd.' -r 26');
if ($iStatus != 0) {
fail('error status ' . $iStatus . ' running nominatim!');
}
+
info('Index postcodes');
- if ($this->oDB == null) $this->oDB =& getDB();
$sSQL = 'UPDATE location_postcode SET indexed_status = 0';
- if (!pg_query($this->oDB->connection, $sSQL)) fail(pg_last_error($this->oDB->connection));
+ $this->pgExec($sSQL);
}
public function createSearchIndices()
info('Create Search indices');
$sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');
+ if (!$this->dbReverseOnly()) {
+ $sTemplate .= file_get_contents(CONST_BasePath.'/sql/indices_search.src.sql');
+ }
$sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate);
$sTemplate = $this->replaceTablespace(
'{ts:address-index}',
'new_query_log',
'spatial_ref_sys',
'country_name',
- 'place_classtype_*'
+ 'place_classtype_*',
+ 'country_osm_grid'
);
- if ($this->oDB = null) $this->oDB =& getDB();
$aDropTables = array();
- $aHaveTables = chksql($this->oDB->getCol("SELECT tablename FROM pg_tables WHERE schemaname='public'"));
+ $aHaveTables = $this->oDB->getCol("SELECT tablename FROM pg_tables WHERE schemaname='public'");
foreach ($aHaveTables as $sTable) {
$bFound = false;
if (!$bFound) array_push($aDropTables, $sTable);
}
foreach ($aDropTables as $sDrop) {
- if ($this->sVerbose) echo "dropping table $sDrop\n";
- @pg_query($this->oDB->connection, "DROP TABLE $sDrop CASCADE");
- // ignore warnings/errors as they might be caused by a table having
- // been deleted already by CASCADE
+ if ($this->bVerbose) echo "Dropping table $sDrop\n";
+ $this->oDB->exec("DROP TABLE IF EXISTS $sDrop CASCADE");
}
if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
- if ($sVerbose) echo 'deleting '.CONST_Osm2pgsql_Flatnode_File."\n";
- unlink(CONST_Osm2pgsql_Flatnode_File);
- }
- }
-
- private function pgsqlRunDropAndRestore($sDumpFile)
- {
- if (!isset($this->aDSNInfo['port']) || !$this->aDSNInfo['port']) $this->aDSNInfo['port'] = 5432;
- $sCMD = 'pg_restore -p '.$this->aDSNInfo['port'].' -d '.$this->aDSNInfo['database'].' -Fc --clean '.$sDumpFile;
- if (isset($this->aDSNInfo['hostspec']) && $this->aDSNInfo['hostspec']) {
- $sCMD .= ' -h '.$this->aDSNInfo['hostspec'];
- }
- if (isset($this->aDSNInfo['username']) && $this->aDSNInfo['username']) {
- $sCMD .= ' -U '.$this->aDSNInfo['username'];
- }
- $aProcEnv = null;
- if (isset($this->aDSNInfo['password']) && $this->aDSNInfo['password']) {
- $aProcEnv = array_merge(array('PGPASSWORD' => $this->aDSNInfo['password']), $_ENV);
+ if (file_exists(CONST_Osm2pgsql_Flatnode_File)) {
+ if ($this->bVerbose) echo 'Deleting '.CONST_Osm2pgsql_Flatnode_File."\n";
+ unlink(CONST_Osm2pgsql_Flatnode_File);
+ }
}
- $iReturn = runWithEnv($sCMD, $aProcEnv); // /lib/cmd.php "function runWithEnv($sCmd, $aEnv)"
}
private function pgsqlRunScript($sScript, $bfatal = true)
runSQLScript(
$sScript,
$bfatal,
- $this->sVerbose,
+ $this->bVerbose,
$this->sIgnoreErrors
);
}
if (!CONST_Use_Aux_Location_data) {
$sTemplate = str_replace('-- %NOAUXDATA% ', '', $sTemplate);
}
+
+ $sReverseOnly = $this->dbReverseOnly() ? 'true' : 'false';
+ $sTemplate = str_replace('%REVERSE-ONLY%', $sReverseOnly, $sTemplate);
+
$this->pgsqlRunScript($sTemplate);
}
private function pgsqlRunPartitionScript($sTemplate)
{
- if ($this->oDB == null) $this->oDB =& getDB();
-
$sSQL = 'select distinct partition from country_name';
- $aPartitions = chksql($this->oDB->getCol($sSQL));
+ $aPartitions = $this->oDB->getCol($sSQL);
if (!$this->bNoPartitions) $aPartitions[] = 0;
preg_match_all('#^-- start(.*?)^-- end#ms', $sTemplate, $aMatches, PREG_SET_ORDER);
{
if (!file_exists($sFilename)) fail('unable to find '.$sFilename);
- $sCMD = 'psql -p '.$this->aDSNInfo['port'].' -d '.$this->aDSNInfo['database'];
- if (!$this->sVerbose) {
+ $sCMD = 'psql'
+ .' -p '.escapeshellarg($this->aDSNInfo['port'])
+ .' -d '.escapeshellarg($this->aDSNInfo['database']);
+ if (!$this->bVerbose) {
$sCMD .= ' -q';
}
- if (isset($this->aDSNInfo['hostspec']) && $this->aDSNInfo['hostspec']) {
- $sCMD .= ' -h '.$this->aDSNInfo['hostspec'];
+ if (isset($this->aDSNInfo['hostspec'])) {
+ $sCMD .= ' -h '.escapeshellarg($this->aDSNInfo['hostspec']);
}
- if (isset($this->aDSNInfo['username']) && $this->aDSNInfo['username']) {
- $sCMD .= ' -U '.$this->aDSNInfo['username'];
+ if (isset($this->aDSNInfo['username'])) {
+ $sCMD .= ' -U '.escapeshellarg($this->aDSNInfo['username']);
}
$aProcEnv = null;
- if (isset($this->aDSNInfo['password']) && $this->aDSNInfo['password']) {
+ if (isset($this->aDSNInfo['password'])) {
$aProcEnv = array_merge(array('PGPASSWORD' => $this->aDSNInfo['password']), $_ENV);
}
$ahGzipPipes = null;
1 => array('pipe', 'w'),
2 => array('file', '/dev/null', 'a')
);
- $hGzipProcess = proc_open('zcat '.$sFilename, $aDescriptors, $ahGzipPipes);
+ $hGzipProcess = proc_open('zcat '.escapeshellarg($sFilename), $aDescriptors, $ahGzipPipes);
if (!is_resource($hGzipProcess)) fail('unable to start zcat');
$aReadPipe = $ahGzipPipes[1];
fclose($ahGzipPipes[0]);
} else {
- $sCMD .= ' -f '.$sFilename;
+ $sCMD .= ' -f '.escapeshellarg($sFilename);
$aReadPipe = array('pipe', 'r');
}
$aDescriptors = array(
}
return $sSql;
}
+
+ private function runWithPgEnv($sCmd)
+ {
+ if ($this->bVerbose) {
+ echo "Execute: $sCmd\n";
+ }
+
+ $aProcEnv = null;
+
+ if (isset($this->aDSNInfo['password'])) {
+ $aProcEnv = array_merge(array('PGPASSWORD' => $this->aDSNInfo['password']), $_ENV);
+ }
+
+ return runWithEnv($sCmd, $aProcEnv);
+ }
+
+ /**
+ * Execute the SQL command on the open database.
+ *
+ * @param string $sSQL SQL command to execute.
+ *
+ * @return null
+ *
+ * @pre connect() must have been called.
+ */
+ private function pgExec($sSQL)
+ {
+ $this->oDB->exec($sSQL);
+ }
+
+ /**
+ * Check if the database is in reverse-only mode.
+ *
+ * @return True if there is no search_name table and infrastructure.
+ */
+ private function dbReverseOnly()
+ {
+ return !($this->oDB->tableExists('search_name'));
+ }
}
projects / nominatim.git / blobdiff