X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/6c406124dd416ec62fc2ce0a4d07d597d3ae53f3..5d656891ba072d88b8b281d239d0dce9f7bd6a1c:/utils/setup.php diff --git a/utils/setup.php b/utils/setup.php index db17b8f5..713fe561 100644 --- a/utils/setup.php +++ b/utils/setup.php @@ -1,8 +1,8 @@ createDB(); } -$oSetup->connect(); - if ($aCMDResult['setup-db'] || $aCMDResult['all']) { $bDidSomething = true; $oSetup->setupDB(); } -// Try accessing the C module, so we know early if something is wrong -checkModulePresence(); // raises exception on failure - if ($aCMDResult['import-data'] || $aCMDResult['all']) { $bDidSomething = true; $oSetup->importData($aCMDResult['osm-file']); @@ -126,7 +118,11 @@ if ($aCMDResult['load-data'] || $aCMDResult['all']) { if ($aCMDResult['import-tiger-data']) { $bDidSomething = true; - $oSetup->importTigerData(); + $sTigerPath = getSetting('TIGER_DATA_PATH'); + if (!$sTigerPath) { + $sTigerPath = CONST_DataDir.'/data/tiger'; + } + $oSetup->importTigerData($sTigerPath); } if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {