hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-16 15:47:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Tiger data import: display which path is searched for files

Browse Source
This commit is contained in:
marc tobias
2019-10-30 15:50:29 +01:00
parent 5930383404
commit c297584726
1 changed files with 5 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/setup/SetupClass.php
View File

@@ -468,6 +468,10 @@ class SetupFunctions
{ {
info('Import Tiger data'); 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 = file_get_contents(CONST_BasePath.'/sql/tiger_import_start.sql');
$sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate); $sTemplate = str_replace('{www-user}', CONST_Database_Web_User, $sTemplate);
$sTemplate = $this->replaceTablespace( $sTemplate = $this->replaceTablespace(
@@ -492,7 +496,7 @@ class SetupFunctions
pg_ping($aDBInstances[$i]); pg_ping($aDBInstances[$i]);
} }
foreach (glob(CONST_Tiger_Data_Path.'/*.sql') as $sFile) { foreach ($aFilenames as $sFile) {
echo $sFile.': '; echo $sFile.': ';
$hFile = fopen($sFile, 'r'); $hFile = fopen($sFile, 'r');
$sSQL = fgets($hFile, 100000); $sSQL = fgets($hFile, 100000);