From a244c41ea7e9828c05be9fdd26d6378178142a3e Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Sat, 23 Apr 2016 11:07:12 +0200 Subject: [PATCH] create_sql_functions() needs the commandline parameters Fixes one failing test. --- utils/setup.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/utils/setup.php b/utils/setup.php index 4a2bc64f..5a6366e7 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -217,7 +217,7 @@ echo "Functions\n"; $bDidSomething = true; if (!file_exists(CONST_InstallPath.'/module/nominatim.so')) fail("nominatim module not built"); - create_sql_functions(); + create_sql_functions($aCMDResult); } if ($aCMDResult['create-tables'] || $aCMDResult['all']) @@ -243,7 +243,7 @@ // re-run the functions echo "Functions\n"; - create_sql_functions(); + create_sql_functions($aCMDResult); } if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) @@ -918,7 +918,7 @@ return $sSql; } - function create_sql_functions() + function create_sql_functions($aCMDResult) { $sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql'); $sTemplate = str_replace('{modulepath}', CONST_InstallPath.'/module', $sTemplate); -- 2.45.1