code beauty improvements

diff --git a/utils/setup.php b/utils/setup.php
index a5512de073d27621e4a47cc0ae90258585e3c000..af9c938d0e74d87f85342bbb1b40eb5822a23d63 100755 (executable)
--- 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;
 
 if ($aCMDResult['create-functions'] || $aCMDResult['all']) {
     $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);

-
-

diff --git a/utils/setup_functions.php b/utils/setup_functions.php
index 2284de30acd262db5d4245176ffcd5124bb84b8a..b257ef17eaa674a601eb64a98753f4826094bba4 100755 (executable)
--- 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');
 
 
         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.');
             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);
         // 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');
 
 {
     info('Import data');
 


@@ -929,5 +929,3 @@ function checkModulePresence()
 
     return $bResult;
 }
 
     return $bResult;
 }

-
-?>