Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 3b04b1617c749b02f6d40a51b0f78cce433035dd..0ecf5e6d97ac3e3668dc162d0d4c09107c410043 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -78,11 +78,13 @@
        }
 
        // Assume we can steal all the cache memory in the box (unless told otherwise)
        }
 
        // Assume we can steal all the cache memory in the box (unless told otherwise)

-       $iCacheMemory = (isset($aCMDResult['osm2pgsql-cache'])?$aCMDResult['osm2pgsql-cache']:getCacheMemoryMB());
-       if ($iCacheMemory > getTotalMemoryMB())
+       if (isset($aCMDResult['osm2pgsql-cache']))
+       {
+               $iCacheMemory = $aCMDResult['osm2pgsql-cache'];
+       }
+       else

        {
                $iCacheMemory = getCacheMemoryMB();
        {
                $iCacheMemory = getCacheMemoryMB();

-               echo "WARNING: resetting cache memory to $iCacheMemory\n";

        }
 
        $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
        }
 
        $aDSNInfo = DB::parseDSN(CONST_Database_DSN);


@@ -198,7 +200,7 @@
                        $osm2pgsql .= ' --tablespace-main-data '.CONST_Tablespace_Place_Data;
                if (CONST_Tablespace_Place_Index)
                        $osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;
                        $osm2pgsql .= ' --tablespace-main-data '.CONST_Tablespace_Place_Data;
                if (CONST_Tablespace_Place_Index)
                        $osm2pgsql .= ' --tablespace-main-index '.CONST_Tablespace_Place_Index;

-               $osm2pgsql .= ' -lsc -O gazetteer --hstore';
+               $osm2pgsql .= ' -lsc -O gazetteer --hstore --number-processes 1';

                $osm2pgsql .= ' -C 25000';
                $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                $osm2pgsql .= ' -C 25000';
                $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];


@@ -484,7 +486,7 @@
                        $aDBInstances[$i] =& getDB(true);
                }
 
                        $aDBInstances[$i] =& getDB(true);
                }
 

-               foreach(glob(CONST_BasePath.'/data/tiger2011/*.sql') as $sFile)
+               foreach(glob(CONST_Tiger_Data_Path.'/*.sql') as $sFile)

                {
                        echo $sFile.': ';
                        $hFile = fopen($sFile, "r");
                {
                        echo $sFile.': ';
                        $hFile = fopen($sFile, "r");


@@ -710,6 +712,7 @@
                @symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php');
                @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php');
                @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/index.php');
                @symlink(CONST_BasePath.'/website/reverse.php', $sTargetDir.'/reverse.php');
                @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/search.php');
                @symlink(CONST_BasePath.'/website/search.php', $sTargetDir.'/index.php');

+               @symlink(CONST_BasePath.'/website/lookup.php', $sTargetDir.'/lookup.php');

                @symlink(CONST_BasePath.'/website/deletable.php', $sTargetDir.'/deletable.php');
                @symlink(CONST_BasePath.'/website/polygons.php', $sTargetDir.'/polygons.php');
                @symlink(CONST_BasePath.'/website/status.php', $sTargetDir.'/status.php');
                @symlink(CONST_BasePath.'/website/deletable.php', $sTargetDir.'/deletable.php');
                @symlink(CONST_BasePath.'/website/polygons.php', $sTargetDir.'/polygons.php');
                @symlink(CONST_BasePath.'/website/status.php', $sTargetDir.'/status.php');