X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/9d103503f71eef5dc6c5f85f5b84b11410f52cdb..fec1ed32cdaaaebe6746fde53279cd8859cbf460:/lib-php/setup/SetupClass.php?ds=sidebyside diff --git a/lib-php/setup/SetupClass.php b/lib-php/setup/SetupClass.php index 4b6439a9..cf2ac6da 100755 --- a/lib-php/setup/SetupClass.php +++ b/lib-php/setup/SetupClass.php @@ -67,76 +67,6 @@ class SetupFunctions } } - public function importTigerData($sTigerPath) - { - info('Import Tiger data'); - - $aFilenames = glob($sTigerPath.'/*.sql'); - info('Found '.count($aFilenames).' SQL files in path '.$sTigerPath); - if (empty($aFilenames)) { - warn('Tiger data import selected but no files found in path '.$sTigerPath); - return; - } - $sTemplate = file_get_contents(CONST_SqlDir.'/tiger_import_start.sql'); - $sTemplate = $this->replaceSqlPatterns($sTemplate); - - $this->pgsqlRunScript($sTemplate, false); - - $aDBInstances = array(); - for ($i = 0; $i < $this->iInstances; $i++) { - // https://secure.php.net/manual/en/function.pg-connect.php - $DSN = getSetting('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 ($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])) { - while (pg_get_result($aDBInstances[$i])); - $sSQL = fgets($hFile, 100000); - if (!$sSQL) break 2; - if (!pg_send_query($aDBInstances[$i], $sSQL)) fail(pg_last_error($aDBInstances[$i])); - $iLines++; - if ($iLines == 1000) { - echo '.'; - $iLines = 0; - } - } - } - usleep(10); - } - fclose($hFile); - - $bAnyBusy = true; - while ($bAnyBusy) { - $bAnyBusy = false; - for ($i = 0; $i < $this->iInstances; $i++) { - 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_SqlDir.'/tiger_import_finish.sql'); - $sTemplate = $this->replaceSqlPatterns($sTemplate); - - $this->pgsqlRunScript($sTemplate, false); - } - public function calculatePostcodes($bCMDResultAll) { info('Calculate Postcodes');