From a8b31090a1ffc2534f97a92ba4d148763d1c5d50 Mon Sep 17 00:00:00 2001 From: ThomasBarris Date: Thu, 23 Aug 2018 08:07:08 +0200 Subject: [PATCH] Revert "code beauty improvements" This reverts commit ee3973f507d0090d493ace4e640a5bc98a62475c. --- utils/setup.php | 4 +++- utils/setup_functions.php | 10 ++++++---- 2 files changed, 9 insertions(+), 5 deletions(-) diff --git a/utils/setup.php b/utils/setup.php index af9c938d..a5512de0 100755 --- a/utils/setup.php +++ b/utils/setup.php @@ -66,7 +66,7 @@ if ($aCMDResult['import-data'] || $aCMDResult['all']) { if ($aCMDResult['create-functions'] || $aCMDResult['all']) { $bDidSomething = true; - create_functions($aCMDResult); + create_functions ($aCMDResult); } if ($aCMDResult['create-tables'] || $aCMDResult['all']) { @@ -131,3 +131,5 @@ if ($aCMDResult['drop']) { } didsomething($bDidSomething); + + diff --git a/utils/setup_functions.php b/utils/setup_functions.php index b257ef17..2284de30 100755 --- a/utils/setup_functions.php +++ b/utils/setup_functions.php @@ -133,7 +133,7 @@ function prepDB($aCMDResult) 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'); } else { warn('external UK postcode table not found.'); @@ -153,11 +153,11 @@ function prepDB($aCMDResult) // versions in create-tables. pgsqlRunScript('CREATE TABLE IF NOT EXISTS place_boundingbox ()'); 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'); @@ -929,3 +929,5 @@ function checkModulePresence() return $bResult; } + +?> -- 2.45.2