From: Sarah Hoffmann <lonvia@denofr.de>
Date: Wed, 28 Dec 2016 22:38:17 +0000 (+0100)
Subject: make path to wikipedia files configurable
X-Git-Tag: v3.0.0~86
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/7273b58bbe987c2cdbf84fb56dfef1995c049985?ds=sidebyside

make path to wikipedia files configurable
---

diff --git a/settings/defaults.php b/settings/defaults.php
index a953e460..e34f4db0 100644
--- a/settings/defaults.php
+++ b/settings/defaults.php
@@ -42,6 +42,7 @@ if (isset($_GET['debug']) && $_GET['debug']) @define('CONST_Debug', true);
 @define('CONST_Osm2pgsql_Binary', CONST_InstallPath.'/osm2pgsql/osm2pgsql');
 @define('CONST_Osmosis_Binary', '/usr/bin/osmosis');
 @define('CONST_Tiger_Data_Path', CONST_BasePath.'/data/tiger');
+@define('CONST_Wikipedia_Data_Path', CONST_BasePath.'/data');
 
 // osm2pgsql settings
 @define('CONST_Osm2pgsql_Flatnode_File', null);
diff --git a/utils/setup.php b/utils/setup.php
index 06216587..e4e91674 100755
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -292,8 +292,8 @@ if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) {
 
 if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) {
     $bDidSomething = true;
-    $sWikiArticlesFile = CONST_BasePath.'/data/wikipedia_article.sql.bin';
-    $sWikiRedirectsFile = CONST_BasePath.'/data/wikipedia_redirect.sql.bin';
+    $sWikiArticlesFile = CONST_Wikipedia_Data_Path.'/wikipedia_article.sql.bin';
+    $sWikiRedirectsFile = CONST_Wikipedia_Data_Path.'/wikipedia_redirect.sql.bin';
     if (file_exists($sWikiArticlesFile)) {
         echo "Importing wikipedia articles...";
         pgsqlRunDropAndRestore($sWikiArticlesFile);