create_sql_functions() needs the commandline parameters

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index cfe7f560191e353153aff9b5500f96f96141ed7b..5a6366e70ccfbd5de3cfa8cf763ba7ac7fccf813 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -217,29 +217,7 @@
                echo "Functions\n";
                $bDidSomething = true;
                if (!file_exists(CONST_InstallPath.'/module/nominatim.so')) fail("nominatim module not built");
-               $sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');
-               $sTemplate = str_replace('{modulepath}', CONST_InstallPath.'/module', $sTemplate);
-               if ($aCMDResult['enable-diff-updates'])
-               {
-                       $sTemplate = str_replace('RETURN NEW; -- %DIFFUPDATES%', '--', $sTemplate);
-               }
-               if ($aCMDResult['enable-debug-statements'])
-               {
-                       $sTemplate = str_replace('--DEBUG:', '', $sTemplate);
-               }
-               if (CONST_Limit_Reindexing)
-               {
-                       $sTemplate = str_replace('--LIMIT INDEXING:', '', $sTemplate);
-               }
-               if (!CONST_Use_US_Tiger_Data)
-               {
-                       $sTemplate = str_replace('-- %NOTIGERDATA% ', '', $sTemplate);
-               }
-               if (!CONST_Use_Aux_Location_data)
-               {
-                       $sTemplate = str_replace('-- %NOAUXDATA% ', '', $sTemplate);
-               }
-               pgsqlRunScript($sTemplate);
+               create_sql_functions($aCMDResult);
        }
 
        if ($aCMDResult['create-tables'] || $aCMDResult['all'])
@@ -265,10 +243,7 @@
 
                // re-run the functions
                echo "Functions\n";
-               $sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');
-               $sTemplate = str_replace('{modulepath}',
-                                            CONST_InstallPath.'/module', $sTemplate);
-               pgsqlRunScript($sTemplate);
+               create_sql_functions($aCMDResult);
        }
 
        if ($aCMDResult['create-partition-tables'] || $aCMDResult['all'])
@@ -943,3 +918,31 @@
                return $sSql;
        }
 
+       function create_sql_functions($aCMDResult)
+       {
+               $sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');
+               $sTemplate = str_replace('{modulepath}', CONST_InstallPath.'/module', $sTemplate);
+               if ($aCMDResult['enable-diff-updates'])
+               {
+                       $sTemplate = str_replace('RETURN NEW; -- %DIFFUPDATES%', '--', $sTemplate);
+               }
+               if ($aCMDResult['enable-debug-statements'])
+               {
+                       $sTemplate = str_replace('--DEBUG:', '', $sTemplate);
+               }
+               if (CONST_Limit_Reindexing)
+               {
+                       $sTemplate = str_replace('--LIMIT INDEXING:', '', $sTemplate);
+               }
+               if (!CONST_Use_US_Tiger_Data)
+               {
+                       $sTemplate = str_replace('-- %NOTIGERDATA% ', '', $sTemplate);
+               }
+               if (!CONST_Use_Aux_Location_data)
+               {
+                       $sTemplate = str_replace('-- %NOAUXDATA% ', '', $sTemplate);
+               }
+               pgsqlRunScript($sTemplate);
+
+       }
+