update documentation for new wikipedia data

[nominatim.git] / lib / setup / SetupClass.php

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index 818aeeb7d1b5cdb083d025cd9c3790b77e4c292d..c1c15d9a5f846384db100800b75ccb6fadd937fd 100755 (executable)
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -323,19 +323,12 @@ class SetupFunctions
 
     public function importWikipediaArticles()
     {
 
     public function importWikipediaArticles()
     {

-        $sWikiArticlesFile = CONST_Wikipedia_Data_Path.'/wikipedia_article.sql.bin';
-        $sWikiRedirectsFile = CONST_Wikipedia_Data_Path.'/wikipedia_redirect.sql.bin';
+        $sWikiArticlesFile = CONST_Wikipedia_Data_Path.'/wikimedia_importance.sql.gz';

         if (file_exists($sWikiArticlesFile)) {
         if (file_exists($sWikiArticlesFile)) {

-            info('Importing wikipedia articles');
+            info('Importing wikipedia articles and redirects');

             $this->pgsqlRunDropAndRestore($sWikiArticlesFile);
         } else {
             $this->pgsqlRunDropAndRestore($sWikiArticlesFile);
         } else {

-            warn('wikipedia article dump file not found - places will have default importance');
-        }
-        if (file_exists($sWikiRedirectsFile)) {
-            info('Importing wikipedia redirects');
-            $this->pgsqlRunDropAndRestore($sWikiRedirectsFile);
-        } else {
-            warn('wikipedia redirect dump file not found - some place importance values may be missing');
+            warn('wikipedia importance dump file not found - places will have default importance');

         }
     }
 
         }
     }