Merge branch 'cmake-port' into master

[nominatim.git] / utils / imports.php

diff --git a/utils/imports.php b/utils/imports.php
index 332e5b3131d04479f989e0f354cac303ec5461ee..a3a4848e9d0c5eb62031a1690b7b598c115ca44e 100755 (executable)
--- 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