From: marc tobias <mtmail@gmx.net>
Date: Wed, 30 Oct 2019 14:50:29 +0000 (+0100)
Subject: Tiger data import: display which path is searched for files
X-Git-Tag: v3.5.0~141^2
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/c297584726d9334d0003d72daecbbdc8312c4cd2?ds=sidebyside;hp=59303834041279d8df0d8c779d454bd95df684bd

Tiger data import: display which path is searched for files
---

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index fd6805fb..a26b7dae 100755
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -468,6 +468,10 @@ class SetupFunctions
     {
         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(
@@ -492,7 +496,7 @@ class SetupFunctions
             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);