Merge branch 'master' of github.com:twain47/Nominatim

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index f520f47d044fa5ce925a8ed3e8444bb253e57397..4de5953f7a0e935298e8d760e55ad00a83407be8 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -105,9 +105,9 @@
                }
                pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
                pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
-               pgsqlRunDropAndRestore(CONST_BasePath.'/data/country_name.sql.bin');
+               pgsqlRunScriptFile(CONST_BasePath.'/data/country_name.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/country_naturalearthdata.sql');
-               pgsqlRunDropAndRestore(CONST_BasePath.'/data/country_osm_grid.sql.bin');
+               pgsqlRunScriptFile(CONST_BasePath.'/data/country_osm_grid.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/us_statecounty.sql');
                pgsqlRunScriptFile(CONST_BasePath.'/data/us_state.sql');
@@ -121,7 +121,11 @@
                $bDidSomething = true;
 
                $osm2pgsql = CONST_Osm2pgsql_Binary;
-               if (!file_exists($osm2pgsql)) fail("please download and build osm2pgsql");
+               if (!file_exists($osm2pgsql))
+               {
+                       echo "Please download and build osm2pgsql.\nIf it is already installed, check the path in your local settings (settings/local.php) file.\n";
+                       fail("osm2pgsql not found in '$osm2pgsql'");
+               }
                $osm2pgsql .= ' -lsc -O gazetteer --hstore';
                $osm2pgsql .= ' -C '.$iCacheMemory;
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
@@ -270,6 +274,19 @@
                if (!pg_query($oDB->connection, 'CREATE SEQUENCE seq_place start 100000')) fail(pg_last_error($oDB->connection));
                echo '.';
 
+               $sSQL = 'select partition from country_name order by country_code';
+               $aPartitions = $oDB->getCol($sSQL);
+               if (PEAR::isError($aPartitions))
+               {
+                       fail($aPartitions->getMessage());
+               }
+               $aPartitions[] = 0;
+               foreach($aPartitions as $sPartition)
+               {
+                       if (!pg_query($oDB->connection, 'TRUNCATE location_road_'.$sPartition)) fail(pg_last_error($oDB->connection));
+                       echo '.';
+               }
+
                // pre-create the word list
                if (!$aCMDResult['disable-token-precalc'])
                {
@@ -441,7 +458,6 @@
                if (isset($aCMDResult['index-output'])) $sOutputFile = ' -F '.$aCMDResult['index-output'];
                $sBaseCmd = CONST_BasePath.'/nominatim/nominatim -i -d '.$aDSNInfo['database'].' -t '.$iInstances.$sOutputFile;
                passthru($sBaseCmd.' -R 4');
-var_dump($sBaseCmd.' -r 15 -R 15');
                if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
                passthru($sBaseCmd.' -r 5 -R 25');
                if (!$aCMDResult['index-noanalyse']) pgsqlRunScript('ANALYSE');
@@ -480,7 +496,12 @@ var_dump($sBaseCmd.' -r 15 -R 15');
        {
                $bDidSomething = true;
                $sTargetDir = $aCMDResult['create-website'];
-               if (!is_dir($sTargetDir)) fail('please specify a directory to setup');
+               if (!is_dir($sTargetDir))
+               {
+                       echo "You must create the website directory before calling this function.\n";
+                       fail("Target directory does not exist.");
+               }
+
                @symlink(CONST_BasePath.'/website/details.php', $sTargetDir.'/details.php');
                @symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php');
                @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php');