splitted createTables and changed formatting to please Travis

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 6afe196c8441470ddbefb8250603b26bba1caa72..8eb90cfa6f065d4d79b088cd837696db1e0cd1b6 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -25,7 +25,7 @@ $bDidSomething = false;
 // Check if osm-file is set and points to a valid file\r
 if ($aCMDResult['import-data'] || $aCMDResult['all']) {\r
     // to remain in /lib/setup_functions.php function\r
-    checkInFile($aCMDResult['osm-file']);  \r
+    checkInFile($aCMDResult['osm-file']);\r
     echo $aCMDResult['osm-file'];\r
 }\r
 \r
@@ -37,7 +37,7 @@ if ($aCMDResult['osmosis-init']) {
 \r
 // ******************************************************\r
 // instantiate Setup class\r
-$cSetup = new SetupFunctions ($aCMDResult); \r
+$cSetup = new SetupFunctions($aCMDResult);\r
 if ($aCMDResult['create-db'] || $aCMDResult['all']) {\r
     $bDidSomething = true;\r
     $cSetup -> createDB();\r
@@ -68,6 +68,7 @@ if ($aCMDResult['create-functions'] || $aCMDResult['all']) {
 if ($aCMDResult['create-tables'] || $aCMDResult['all']) {\r
     $bDidSomething = true;\r
     $cSetup -> createTables();\r
+    $cSetup -> recreateFunction();\r
 }\r
 \r
 if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) {\r
@@ -79,12 +80,12 @@ if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) {
     $bDidSomething = true;\r
     $cSetup -> createPartitionFunctions();\r
 }\r
-/*\r
+\r
 if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) {\r
     $bDidSomething = true;\r
     $cSetup -> importWikipediaArticles();\r
 }\r
-*/\r
+\r
 if ($aCMDResult['load-data'] || $aCMDResult['all']) {\r
     $bDidSomething = true;\r
     $cSetup -> loadData($aCMDResult['disable-token-precalc']);\r
@@ -130,6 +131,3 @@ if (!$bDidSomething) {
     echo "\n";\r
     info('Setup finished.');\r
 }\r
-\r
-\r
-\r