make path to wikipedia files configurable

diff --git a/settings/defaults.php b/settings/defaults.php
index a953e460f1d81a7651cedd606d5d238e3613822c..e34f4db04200a96549569c91c5bda4587b1ef5a5 100644 (file)
--- 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_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);
 
 // osm2pgsql settings
 @define('CONST_Osm2pgsql_Flatnode_File', null);

diff --git a/utils/setup.php b/utils/setup.php
index 0621658711569103a49b0a64a977dc7d5c0b4b00..e4e916746c9247bf55176587255cbe8383d5d9a3 100755 (executable)
--- 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;
 
 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);
     if (file_exists($sWikiArticlesFile)) {
         echo "Importing wikipedia articles...";
         pgsqlRunDropAndRestore($sWikiArticlesFile);