Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index e588bb084a5ff285e60e62ee38be4978eada8843..cece86867417969914b5137a4bdf1d156419b28a 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;
 
+       $fPostgisVersion = (float) CONST_Postgis_Version;
+
        if ($aCMDResult['create-db'] || $aCMDResult['all'])
        {
                echo "Create DB\n";
@@ -126,7 +128,6 @@
                        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');
@@ -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 ($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'])
@@ -686,6 +695,10 @@
        {
                showUsage($aCMDOptions, true);
        }
+       else
+       {
+               echo "Setup finished.\n";
+       }
 
        function pgsqlRunScriptFile($sFilename)
        {