Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 734f669f61082774181fe0014858ef064a5f830f..e588bb084a5ff285e60e62ee38be4978eada8843 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -192,7 +192,7 @@
                }
                $osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
                $osm2pgsql .= ' -lsc -O gazetteer --hstore';
-               $osm2pgsql .= ' -C 18000';
+               $osm2pgsql .= ' -C 25000';
                $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                passthruCheckReturn($osm2pgsql);
@@ -803,10 +803,6 @@
                fclose($ahPipes[1]);
 
                $iReturn = proc_close($hProcess);
-               if ($iReturn > 0)
-               {
-                       fail("pgsql returned with error code ($iReturn)");
-               }
        }
 
        function pgsqlRunDropAndRestore($sDumpFile)
@@ -835,10 +831,6 @@
                fclose($ahPipes[1]);
 
                $iReturn = proc_close($hProcess);
-               if ($iReturn > 0)
-               {
-                       fail("pgsql returned with error code ($iReturn)");
-               }
        }
 
        function passthruCheckReturn($cmd)