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

diff --combined utils/setup.php
index 989e9887926dca587d0090f8d3d1b968c3883c1a,049ef860d2a9b933a9facee787e3ec92dc6be3a2..fb83dd0aa9fbc02aad2ed0c07075917f940395a5
--- 1/utils/setup.php
--- 2/utils/setup.php
+++ b/utils/setup.php
@@@ -126,9 -126,8 +126,9 @@@
                        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 .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
                $osm2pgsql .= ' -lsc -O gazetteer --hstore';
 -              $osm2pgsql .= ' -C '.$iCacheMemory;
 +              $osm2pgsql .= ' -C 16000';
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                passthruCheckReturn($osm2pgsql);
  
@@@ -321,7 -320,6 +321,7 @@@
                        echo '.';
                }
                echo "\n";
 +              pgsqlRunScript('ALTER TABLE place SET TABLESPACE "data"');
                echo "Reanalysing database...\n";
                pgsqlRunScript('ANALYSE');
        }
@@@ -359,6 -357,8 +359,8 @@@
        {
                $bDidSomething = true;
  
+               pgsqlRunScriptFile(CONST_BasePath.'/sql/tiger_import_start.sql');
+ 
                $aDBInstances = array();
                for($i = 0; $i < $iInstances; $i++)
                {
@@@ -407,6 -407,9 +409,9 @@@
                        }
                        echo "\n";
                }
+ 
+               echo "Creating indexes\n";
+               pgsqlRunScriptFile(CONST_BasePath.'/sql/tiger_import_finish.sql');
        }
  
        if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all'])