respect --osm2pgsql-cache setting

fixes #260

diff --git a/utils/setup.php b/utils/setup.php
index 3fad6fe80bc4e09e74a6ce260c845d723d8cf790..14fe675e9c2173b79a6298fc673b44c53739a4df 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)
-       $iCacheMemory = (isset($aCMDResult['osm2pgsql-cache'])?$aCMDResult['osm2pgsql-cache']:getCacheMemoryMB());
-       if ($iCacheMemory > getTotalMemoryMB())
+       if (isset($aCMDResult['osm2pgsql-cache']))
+       {
+               $iCacheMemory = $aCMDResult['osm2pgsql-cache'];
+       }
+       else
        {
                $iCacheMemory = getCacheMemoryMB();
-               echo "WARNING: resetting cache memory to $iCacheMemory\n";
        }
 
        $aDSNInfo = DB::parseDSN(CONST_Database_DSN);