strip query log to minimum info not available in apache logs

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 734f669f61082774181fe0014858ef064a5f830f..32b5670060660a9afd2029e1968ae29319c2bafe 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -89,6 +89,8 @@
        $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
        if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
 
        $aDSNInfo = DB::parseDSN(CONST_Database_DSN);
        if (!isset($aDSNInfo['port']) || !$aDSNInfo['port']) $aDSNInfo['port'] = 5432;
 

+       $fPostgisVersion = (float) CONST_Postgis_Version;
+

        if ($aCMDResult['create-db'] || $aCMDResult['all'])
        {
                echo "Create DB\n";
        if ($aCMDResult['create-db'] || $aCMDResult['all'])
        {
                echo "Create DB\n";


@@ -110,7 +112,7 @@
                $oDB =& getDB();
 
                $sVersionString = $oDB->getOne('select version()');
                $oDB =& getDB();
 
                $sVersionString = $oDB->getOne('select version()');

-               preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[.]([0-9]+) #', $sVersionString, $aMatches);
+               preg_match('#PostgreSQL ([0-9]+)[.]([0-9]+)[^0-9]#', $sVersionString, $aMatches);

                if (CONST_Postgresql_Version != $aMatches[1].'.'.$aMatches[2])
                {
                        echo "ERROR: PostgreSQL version is not correct.  Expected ".CONST_Postgresql_Version." found ".$aMatches[1].'.'.$aMatches[2]."\n";
                if (CONST_Postgresql_Version != $aMatches[1].'.'.$aMatches[2])
                {
                        echo "ERROR: PostgreSQL version is not correct.  Expected ".CONST_Postgresql_Version." found ".$aMatches[1].'.'.$aMatches[2]."\n";


@@ -126,7 +128,6 @@
                        pgsqlRunScript('CREATE EXTENSION hstore');
                }
 
                        pgsqlRunScript('CREATE EXTENSION hstore');
                }
 

-               $fPostgisVersion = (float) CONST_Postgis_Version;

                if ($fPostgisVersion < 2.0) {
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');
                if ($fPostgisVersion < 2.0) {
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/postgis.sql');
                        pgsqlRunScriptFile(CONST_Path_Postgresql_Postgis.'/spatial_ref_sys.sql');


@@ -192,7 +193,7 @@
                }
                $osm2pgsql .= ' --tablespace-slim-index ssd --tablespace-main-index ssd --tablespace-main-data ssd --tablespace-slim-data data';
                $osm2pgsql .= ' -lsc -O gazetteer --hstore';
                }
                $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);
                $osm2pgsql .= ' -P '.$aDSNInfo['port'];
                $osm2pgsql .= ' -d '.$aDSNInfo['database'].' '.$aCMDResult['osm-file'];
                passthruCheckReturn($osm2pgsql);


@@ -216,6 +217,14 @@
                if ($aCMDResult['enable-debug-statements']) $sTemplate = str_replace('--DEBUG:', '', $sTemplate);
                if (CONST_Limit_Reindexing) $sTemplate = str_replace('--LIMIT INDEXING:', '', $sTemplate);
                pgsqlRunScript($sTemplate);
                if ($aCMDResult['enable-debug-statements']) $sTemplate = str_replace('--DEBUG:', '', $sTemplate);
                if (CONST_Limit_Reindexing) $sTemplate = str_replace('--LIMIT INDEXING:', '', $sTemplate);
                pgsqlRunScript($sTemplate);

+               if ($fPostgisVersion < 2.0) {
+                       echo "Helper functions for postgis < 2.0\n";
+                       $sTemplate = file_get_contents(CONST_BasePath.'/sql/postgis_15_aux.sql');
+               } else {
+                       echo "Helper functions for postgis >= 2.0\n";
+                       $sTemplate = file_get_contents(CONST_BasePath.'/sql/postgis_20_aux.sql');
+               }
+               pgsqlRunScript($sTemplate);

        }
 
        if ($aCMDResult['create-minimal-tables'])
        }
 
        if ($aCMDResult['create-minimal-tables'])


@@ -686,6 +695,10 @@
        {
                showUsage($aCMDOptions, true);
        }
        {
                showUsage($aCMDOptions, true);
        }

+       else
+       {
+               echo "Setup finished.\n";
+       }

 
        function pgsqlRunScriptFile($sFilename)
        {
 
        function pgsqlRunScriptFile($sFilename)
        {


@@ -803,10 +816,6 @@
                fclose($ahPipes[1]);
 
                $iReturn = proc_close($hProcess);
                fclose($ahPipes[1]);
 
                $iReturn = proc_close($hProcess);

-               if ($iReturn > 0)
-               {
-                       fail("pgsql returned with error code ($iReturn)");
-               }

        }
 
        function pgsqlRunDropAndRestore($sDumpFile)
        }
 
        function pgsqlRunDropAndRestore($sDumpFile)


@@ -835,10 +844,6 @@
                fclose($ahPipes[1]);
 
                $iReturn = proc_close($hProcess);
                fclose($ahPipes[1]);
 
                $iReturn = proc_close($hProcess);

-               if ($iReturn > 0)
-               {
-                       fail("pgsql returned with error code ($iReturn)");
-               }

        }
 
        function passthruCheckReturn($cmd)
        }
 
        function passthruCheckReturn($cmd)