X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3134fb8b407cbf6dd6a2f0241435d4b0f50ff98e..5c187e131a372d0cbdbba3372668862e3f1c47f9:/utils/imports.php

diff --git a/utils/imports.php b/utils/imports.php
index 332e5b31..a3a4848e 100755
--- a/utils/imports.php
+++ b/utils/imports.php
@@ -1,9 +1,9 @@
 #!/usr/bin/php -Cq
 <?php
 
-	require_once(dirname(dirname(__FILE__)).'/lib/init-cmd.php');
+	require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+	require_once(CONST_BasePath.'/lib/init-cmd.php');
 	ini_set('memory_limit', '800M');
-	$sDefaultDataPath = CONST_BasePath.'/data/tiger2014';
 
 	$aCMDOptions = array(
 		"Create and setup nominatim search system",
@@ -18,7 +18,7 @@
 
 	if (isset($aCMDResult['parse-tiger']))
 	{
-		if (!file_exists($sDefaultDataPath)) mkdir($sDefaultDataPath);
+		if (!file_exists(CONST_Tiger_Data_Path)) mkdir(CONST_Tiger_Data_Path);
 
 		$sTempDir = tempnam('/tmp', 'tiger');
 		unlink($sTempDir);
@@ -48,7 +48,7 @@
 				}
 				else
 				{
-					copy($sOsmFile, $sDefaultDataPath.'/'.$sCountyID.'.sql');
+					copy($sOsmFile, CONST_Tiger_Data_Path.'/'.$sCountyID.'.sql');
 				}
 			}
 			// Cleanup