osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-27 15:05:28 +03:00
Code Issues Packages Projects Releases Wiki Activity

code beauty improvements

Browse Source
This commit is contained in:
ThomasBarris 2018-08-22 21:33:17 +02:00
parent 55fa051d3a
commit ee3973f507
2 changed files with 5 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
utils/setup.php
View File

@ -66,7 +66,7 @@ if ($aCMDResult['import-data'] || $aCMDResult['all']) {
if ($aCMDResult['create-functions'] || $aCMDResult['all']) { if ($aCMDResult['create-functions'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
create_functions ($aCMDResult); create_functions($aCMDResult);
} }
if ($aCMDResult['create-tables'] || $aCMDResult['all']) { if ($aCMDResult['create-tables'] || $aCMDResult['all']) {
@ -131,5 +131,3 @@ if ($aCMDResult['drop']) {
} }
didsomething($bDidSomething); didsomething($bDidSomething);

10
utils/setup_functions.php
View File

@ -133,7 +133,7 @@ function prepDB($aCMDResult)
pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_table.sql'); pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_table.sql');
if (file_exists(CONST_BasePath.'/data/gb_postcode_data.sql.gz')) { if (file_exists(CONST_BasePath.'/data/gb_postcode_data.sql.gz')) {
pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_data.sql.gz'); pgsqlRunScriptFile(CONST_BasePath.'/data/gb_postcode_data.sql.gz');
} else { } else {
warn('external UK postcode table not found.'); warn('external UK postcode table not found.');
@ -153,11 +153,11 @@ function prepDB($aCMDResult)
// versions in create-tables. // versions in create-tables.
pgsqlRunScript('CREATE TABLE IF NOT EXISTS place_boundingbox ()'); pgsqlRunScript('CREATE TABLE IF NOT EXISTS place_boundingbox ()');
pgsqlRunScript('CREATE TYPE wikipedia_article_match AS ()', false); pgsqlRunScript('CREATE TYPE wikipedia_article_match AS ()', false);
} }
return $aDSNInfo; return $aDSNInfo;
} }
function import_data($aCMDResult, $iCacheMemory,$aDSNInfo) function import_data($aCMDResult, $iCacheMemory, $aDSNInfo)
{ {
info('Import data'); info('Import data');
@ -929,5 +929,3 @@ function checkModulePresence()
return $bResult; return $bResult;
} }
?>