hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-02-26 11:08:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

create_sql_functions() needs the commandline parameters

Browse Source 
Fixes one failing test.
This commit is contained in:
Sarah Hoffmann
2016-04-23 11:07:12 +02:00
parent b4f0b8b728
commit a244c41ea7
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
utils/setup.php
View File

@@ -217,7 +217,7 @@
echo "Functions\n"; echo "Functions\n";
$bDidSomething = true; $bDidSomething = true;
if (!file_exists(CONST_InstallPath.'/module/nominatim.so')) fail("nominatim module not built"); 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']) if ($aCMDResult['create-tables'] || $aCMDResult['all'])
@@ -243,7 +243,7 @@
// re-run the functions // re-run the functions
echo "Functions\n"; echo "Functions\n";
create_sql_functions(); create_sql_functions($aCMDResult);
} }
if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) if ($aCMDResult['create-partition-tables'] || $aCMDResult['all'])
@@ -918,7 +918,7 @@
return $sSql; return $sSql;
} }
function create_sql_functions() function create_sql_functions($aCMDResult)
{ {
$sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql'); $sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');
$sTemplate = str_replace('{modulepath}', CONST_InstallPath.'/module', $sTemplate); $sTemplate = str_replace('{modulepath}', CONST_InstallPath.'/module', $sTemplate);