splitted createTables and changed formatting to please Travis

diff --git a/lib/setup_functions.php b/lib/setup_functions.php
index da66fc7d89813b509c36c7dcce3f479deef540bf..fec28f17c42b3c3eb76a76e87ae7834e878a1f01 100755 (executable)
--- a/lib/setup_functions.php
+++ b/lib/setup_functions.php
@@ -1,6 +1,7 @@
 <?php\r
 \r
 <?php\r
 \r

-function checkInFile($sOSMFile) {\r
+function checkInFile($sOSMFile) \r
+{\r

     if (!isset($sOSMFile)) {\r
         fail('missing --osm-file for data import');\r
     }\r
     if (!isset($sOSMFile)) {\r
         fail('missing --osm-file for data import');\r
     }\r


@@ -14,7 +15,8 @@ function checkInFile($sOSMFile) {
     }\r
 }\r
 \r
     }\r
 }\r
 \r

-function checkModulePresence() {\r
+function checkModulePresence() \r
+{\r

     // Try accessing the C module, so we know early if something is wrong\r
     // and can simply error out.\r
     $sModulePath = CONST_Database_Module_Path;\r
     // Try accessing the C module, so we know early if something is wrong\r
     // and can simply error out.\r
     $sModulePath = CONST_Database_Module_Path;\r


@@ -36,7 +38,8 @@ function checkModulePresence() {
     return $bResult;\r
 }\r
 \r
     return $bResult;\r
 }\r
 \r

-function createSetupArgvArray() {\r
+function createSetupArgvArray() \r
+{\r

     $aCMDOptions\r
     = array(\r
     'Create and setup nominatim search system',\r
     $aCMDOptions\r
     = array(\r
     'Create and setup nominatim search system',\r

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
 // 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
     echo $aCMDResult['osm-file'];\r
 }\r
 \r


@@ -37,7 +37,7 @@ if ($aCMDResult['osmosis-init']) {
 \r
 // ******************************************************\r
 // instantiate Setup class\r
 \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
 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
 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
 }\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
     $bDidSomething = true;\r
     $cSetup -> createPartitionFunctions();\r
 }\r

-/*\r
+\r

 if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) {\r
     $bDidSomething = true;\r
     $cSetup -> importWikipediaArticles();\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
 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
     echo "\n";\r
     info('Setup finished.');\r
 }\r

-\r
-\r
-\r

diff --git a/utils/setupClass.php b/utils/setupClass.php
index 03a0205bf3fd602b670284e8998f9d56c814ed15..c516154207503ab175bffcded5496ee8edda7ced 100755 (executable)
--- a/utils/setupClass.php
+++ b/utils/setupClass.php
@@ -1,9 +1,6 @@
 <?php\r
 \r
 <?php\r
 \r

-\r
-\r

 class SetupFunctions\r
 class SetupFunctions\r

-\r

 {\r
     protected $iCacheMemory;            // set in constructor\r
     protected $iInstances;              // set in constructor\r
 {\r
     protected $iCacheMemory;            // set in constructor\r
     protected $iInstances;              // set in constructor\r


@@ -17,7 +14,6 @@ class SetupFunctions
     protected $oDB = null;              // set in setupDB (earliest) or later in loadData, importData, drop, createSqlFunctions, importTigerData\r
                                                 // pgsqlRunPartitionScript, calculatePostcodes, ..if no already set \r
 \r
     protected $oDB = null;              // set in setupDB (earliest) or later in loadData, importData, drop, createSqlFunctions, importTigerData\r
                                                 // pgsqlRunPartitionScript, calculatePostcodes, ..if no already set \r
 \r

-\r

     public function __construct($aCMDResult) {\r
         // by default, use all but one processor, but never more than 15.\r
         $this->iInstances = isset($aCMDResult['threads'])\r
     public function __construct($aCMDResult) {\r
         // by default, use all but one processor, but never more than 15.\r
         $this->iInstances = isset($aCMDResult['threads'])\r


@@ -50,10 +46,10 @@ class SetupFunctions
         $this->bEnableDiffUpdates = $aCMDResult['enable-diff-updates'];\r
         $this->bEnableDebugStatements = $aCMDResult['enable-debug-statements'];\r
         $this->bNoPartitions = $aCMDResult['no-partitions'];\r
         $this->bEnableDiffUpdates = $aCMDResult['enable-diff-updates'];\r
         $this->bEnableDebugStatements = $aCMDResult['enable-debug-statements'];\r
         $this->bNoPartitions = $aCMDResult['no-partitions'];\r

- \r

     }\r
 \r
     }\r
 \r

-    public function createDB(){\r
+    public function createDB()\r
+    {\r

         info('Create DB');\r
         $sDB = DB::connect(CONST_Database_DSN, false);\r
         if (!PEAR::isError($sDB)) {\r
         info('Create DB');\r
         $sDB = DB::connect(CONST_Database_DSN, false);\r
         if (!PEAR::isError($sDB)) {\r


@@ -78,7 +74,8 @@ class SetupFunctions
         if ($result != 0) fail('Error executing external command: '.$sCreateDBCmd);\r
     }\r
 \r
         if ($result != 0) fail('Error executing external command: '.$sCreateDBCmd);\r
     }\r
 \r

-    public function setupDB() {\r
+    public function setupDB()\r
+    {\r

         info('Setup DB');\r
         $this->oDB =& getDB();\r
 \r
         info('Setup DB');\r
         $this->oDB =& getDB();\r
 \r


@@ -155,7 +152,8 @@ class SetupFunctions
         $this->pgsqlRunScript('CREATE TYPE wikipedia_article_match AS ()', false);\r
     }\r
 \r
         $this->pgsqlRunScript('CREATE TYPE wikipedia_article_match AS ()', false);\r
     }\r
 \r

-    public function importData($sOSMFile) {\r
+    public function importData($sOSMFile)\r
+    {\r

         info('Import data');\r
 \r
         $osm2pgsql = CONST_Osm2pgsql_Binary;\r
         info('Import data');\r
 \r
         $osm2pgsql = CONST_Osm2pgsql_Binary;\r


@@ -200,13 +198,15 @@ class SetupFunctions
         }\r
     }\r
 \r
         }\r
     }\r
 \r

-    public function createFunctions() {\r
+    public function createFunctions()\r
+    {\r

         info('Create Functions');\r
 \r
         $this->createSqlFunctions();\r
     }\r
 \r
         info('Create Functions');\r
 \r
         $this->createSqlFunctions();\r
     }\r
 \r

-    public function createTables() {\r
+    public function createTables()\r
+    {\r

         info('Create Tables');\r
 \r
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/tables.sql');\r
         info('Create Tables');\r
 \r
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/tables.sql');\r


@@ -243,13 +243,17 @@ class SetupFunctions
         );\r
 \r
         $this->pgsqlRunScript($sTemplate, false);\r
         );\r
 \r
         $this->pgsqlRunScript($sTemplate, false);\r

+    }\r

 \r
 \r

+    public function recreateFunction()\r
+    {\r

         // re-run the functions\r
         info('Recreate Functions');\r
         $this->createSqlFunctions();\r
     }\r
 \r
         // re-run the functions\r
         info('Recreate Functions');\r
         $this->createSqlFunctions();\r
     }\r
 \r

-    public function createPartitionTables() {\r
+    public function createPartitionTables()\r
+    {\r

         info('Create Partition Tables');\r
 \r
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql');\r
         info('Create Partition Tables');\r
 \r
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-tables.src.sql');\r


@@ -292,14 +296,16 @@ class SetupFunctions
         $this->pgsqlRunPartitionScript($sTemplate);\r
     }\r
 \r
         $this->pgsqlRunPartitionScript($sTemplate);\r
     }\r
 \r

-    public function createPartitionFunctions() {\r
+    public function createPartitionFunctions()\r
+    {\r

         info('Create Partition Functions');\r
 \r
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-functions.src.sql');\r
         $this->pgsqlRunPartitionScript($sTemplate);\r
     }\r
 \r
         info('Create Partition Functions');\r
 \r
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/partition-functions.src.sql');\r
         $this->pgsqlRunPartitionScript($sTemplate);\r
     }\r
 \r

-    public function importWikipediaArticles() {\r
+    public function importWikipediaArticles()\r
+    {\r

         $sWikiArticlesFile = CONST_Wikipedia_Data_Path.'/wikipedia_article.sql.bin';\r
         $sWikiRedirectsFile = CONST_Wikipedia_Data_Path.'/wikipedia_redirect.sql.bin';\r
         if (file_exists($sWikiArticlesFile)) {\r
         $sWikiArticlesFile = CONST_Wikipedia_Data_Path.'/wikipedia_article.sql.bin';\r
         $sWikiRedirectsFile = CONST_Wikipedia_Data_Path.'/wikipedia_redirect.sql.bin';\r
         if (file_exists($sWikiArticlesFile)) {\r


@@ -315,9 +321,10 @@ class SetupFunctions
             warn('wikipedia redirect dump file not found - some place importance values may be missing');\r
         }\r
         echo ' finish wikipedia';\r
             warn('wikipedia redirect dump file not found - some place importance values may be missing');\r
         }\r
         echo ' finish wikipedia';\r

-    }    \r
+    }\r

 \r
 \r

-    public function loadData($bDisableTokenPrecalc) {\r
+    public function loadData($bDisableTokenPrecalc)\r
+    {\r

         info('Drop old Data');\r
 \r
         if ($this->oDB == null) $this->oDB =& getDB();\r
         info('Drop old Data');\r
 \r
         if ($this->oDB == null) $this->oDB =& getDB();\r


@@ -382,7 +389,6 @@ class SetupFunctions
         }\r
 \r
         // last thread for interpolation lines\r
         }\r
 \r
         // last thread for interpolation lines\r

-\r

         $aDBInstances[$iLoadThreads] =& getDB(true);\r
         $sSQL = 'insert into location_property_osmline';\r
         $sSQL .= ' (osm_id, address, linegeo)';\r
         $aDBInstances[$iLoadThreads] =& getDB(true);\r
         $sSQL = 'insert into location_property_osmline';\r
         $sSQL .= ' (osm_id, address, linegeo)';\r


@@ -426,7 +432,8 @@ class SetupFunctions
         }\r
     }\r
 \r
         }\r
     }\r
 \r

-    public function importTigerData() {\r
+    public function importTigerData()\r
+    {\r

         info('Import Tiger data');\r
 \r
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_start.sql');\r
         info('Import Tiger data');\r
 \r
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/tiger_import_start.sql');\r


@@ -498,7 +505,8 @@ class SetupFunctions
         $this->pgsqlRunScript($sTemplate, false);\r
     }\r
 \r
         $this->pgsqlRunScript($sTemplate, false);\r
     }\r
 \r

-    public function calculatePostcodes($bCMDResultAll) {\r
+    public function calculatePostcodes($bCMDResultAll)\r
+    {\r

         info('Calculate Postcodes');\r
         if ($this->oDB == null) $this->oDB =& getDB();\r
         if (!pg_query($this->oDB->connection, 'TRUNCATE location_postcode')) {\r
         info('Calculate Postcodes');\r
         if ($this->oDB == null) $this->oDB =& getDB();\r
         if (!pg_query($this->oDB->connection, 'TRUNCATE location_postcode')) {\r


@@ -556,9 +564,11 @@ class SetupFunctions
         }\r
     }\r
 \r
         }\r
     }\r
 \r

-    public function index($bIndexNoanalyse) {\r
+    public function index($bIndexNoanalyse)\r
+    {\r

         $sOutputFile = '';\r
         $sOutputFile = '';\r

-        $sBaseCmd = CONST_InstallPath.'/nominatim/nominatim -i -d '.$this->aDSNInfo['database'].' -P '.$this->aDSNInfo['port'].' -t '.$this->iInstances.$sOutputFile;\r
+        $sBaseCmd = CONST_InstallPath.'/nominatim/nominatim -i -d '.$this->aDSNInfo['database'].' -P '\r
+            .$this->aDSNInfo['port'].' -t '.$this->iInstances.$sOutputFile;\r

         if (isset($this->aDSNInfo['hostspec']) && $this->aDSNInfo['hostspec']) {\r
             $sBaseCmd .= ' -H ' . $this->aDSNInfo['hostspec'];\r
         }\r
         if (isset($this->aDSNInfo['hostspec']) && $this->aDSNInfo['hostspec']) {\r
             $sBaseCmd .= ' -H ' . $this->aDSNInfo['hostspec'];\r
         }\r


@@ -591,9 +601,10 @@ class SetupFunctions
         if ($this->oDB == null) $this->oDB =& getDB();\r
         $sSQL = 'UPDATE location_postcode SET indexed_status = 0';\r
         if (!pg_query($this->oDB->connection, $sSQL)) fail(pg_last_error($this->oDB->connection));\r
         if ($this->oDB == null) $this->oDB =& getDB();\r
         $sSQL = 'UPDATE location_postcode SET indexed_status = 0';\r
         if (!pg_query($this->oDB->connection, $sSQL)) fail(pg_last_error($this->oDB->connection));\r

-    }    \r
+    }\r

 \r
 \r

-    public function createSearchIndices() {\r
+    public function createSearchIndices()\r
+    {\r

         info('Create Search indices');\r
 \r
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');\r
         info('Create Search indices');\r
 \r
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/indices.src.sql');\r


@@ -616,14 +627,16 @@ class SetupFunctions
         $this->pgsqlRunScript($sTemplate);\r
     }\r
 \r
         $this->pgsqlRunScript($sTemplate);\r
     }\r
 \r

-    public function createCountryNames() {\r
+    public function createCountryNames()\r
+    {\r

         info('Create search index for default country names');\r
 \r
         $this->pgsqlRunScript("select getorcreate_country(make_standard_name('uk'), 'gb')");\r
         $this->pgsqlRunScript("select getorcreate_country(make_standard_name('united states'), 'us')");\r
         $this->pgsqlRunScript('select count(*) from (select getorcreate_country(make_standard_name(country_code), country_code) from country_name where country_code is not null) as x');\r
         $this->pgsqlRunScript("select count(*) from (select getorcreate_country(make_standard_name(name->'name'), country_code) from country_name where name ? 'name') as x");\r
         info('Create search index for default country names');\r
 \r
         $this->pgsqlRunScript("select getorcreate_country(make_standard_name('uk'), 'gb')");\r
         $this->pgsqlRunScript("select getorcreate_country(make_standard_name('united states'), 'us')");\r
         $this->pgsqlRunScript('select count(*) from (select getorcreate_country(make_standard_name(country_code), country_code) from country_name where country_code is not null) as x');\r
         $this->pgsqlRunScript("select count(*) from (select getorcreate_country(make_standard_name(name->'name'), country_code) from country_name where name ? 'name') as x");\r

-        $sSQL = 'select count(*) from (select getorcreate_country(make_standard_name(v), country_code) from (select country_code, skeys(name) as k, svals(name) as v from country_name) x where k ';\r
+        $sSQL = 'select count(*) from (select getorcreate_country(make_standard_name(v),'\r
+            .'country_code) from (select country_code, skeys(name) as k, svals(name) as v from country_name) x where k ';\r

         if (CONST_Languages) {\r
             $sSQL .= 'in ';\r
             $sDelim = '(';\r
         if (CONST_Languages) {\r
             $sSQL .= 'in ';\r
             $sDelim = '(';\r


@@ -640,7 +653,8 @@ class SetupFunctions
         $this->pgsqlRunScript($sSQL);\r
     }\r
 \r
         $this->pgsqlRunScript($sSQL);\r
     }\r
 \r

-    public function drop() {\r
+    public function drop()\r
+    {\r

         info('Drop tables only required for updates');\r
 \r
         // The implementation is potentially a bit dangerous because it uses\r
         info('Drop tables only required for updates');\r
 \r
         // The implementation is potentially a bit dangerous because it uses\r


@@ -693,7 +707,8 @@ class SetupFunctions
         }\r
     }\r
 \r
         }\r
     }\r
 \r

-    private function pgsqlRunDropAndRestore($sDumpFile) {\r
+    private function pgsqlRunDropAndRestore($sDumpFile)\r
+    {\r

         if (!isset($this->aDSNInfo['port']) || !$this->aDSNInfo['port']) $this->aDSNInfo['port'] = 5432;\r
         $sCMD = 'pg_restore -p '.$this->aDSNInfo['port'].' -d '.$this->aDSNInfo['database'].' -Fc --clean '.$sDumpFile;\r
         if (isset($this->aDSNInfo['hostspec']) && $this->aDSNInfo['hostspec']) {\r
         if (!isset($this->aDSNInfo['port']) || !$this->aDSNInfo['port']) $this->aDSNInfo['port'] = 5432;\r
         $sCMD = 'pg_restore -p '.$this->aDSNInfo['port'].' -d '.$this->aDSNInfo['database'].' -Fc --clean '.$sDumpFile;\r
         if (isset($this->aDSNInfo['hostspec']) && $this->aDSNInfo['hostspec']) {\r


@@ -709,7 +724,8 @@ class SetupFunctions
         $iReturn = runWithEnv($sCMD, $aProcEnv);    // /lib/cmd.php "function runWithEnv($sCmd, $aEnv)"\r
     }\r
                      \r
         $iReturn = runWithEnv($sCMD, $aProcEnv);    // /lib/cmd.php "function runWithEnv($sCmd, $aEnv)"\r
     }\r
                      \r

-    private function pgsqlRunScript($sScript, $bfatal = true) {\r
+    private function pgsqlRunScript($sScript, $bfatal = true)\r
+    {\r

         runSQLScript(\r
             $sScript,\r
             $bfatal,\r
         runSQLScript(\r
             $sScript,\r
             $bfatal,\r


@@ -718,7 +734,8 @@ class SetupFunctions
         );\r
     }\r
 \r
         );\r
     }\r
 \r

-    private function createSqlFunctions() {        \r
+    private function createSqlFunctions()\r
+    {\r

         $sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');\r
         $sTemplate = str_replace('{modulepath}', $this->sModulePath, $sTemplate);\r
         if ($this->bEnableDiffUpdates) {\r
         $sTemplate = file_get_contents(CONST_BasePath.'/sql/functions.sql');\r
         $sTemplate = str_replace('{modulepath}', $this->sModulePath, $sTemplate);\r
         if ($this->bEnableDiffUpdates) {\r


@@ -739,7 +756,8 @@ class SetupFunctions
         $this->pgsqlRunScript($sTemplate);\r
     }\r
 \r
         $this->pgsqlRunScript($sTemplate);\r
     }\r
 \r

-    private function pgsqlRunPartitionScript($sTemplate) {\r
+    private function pgsqlRunPartitionScript($sTemplate)\r
+    {\r

         if ($this->oDB == null) $this->oDB =& getDB();\r
 \r
         $sSQL = 'select distinct partition from country_name';\r
         if ($this->oDB == null) $this->oDB =& getDB();\r
 \r
         $sSQL = 'select distinct partition from country_name';\r


@@ -756,9 +774,10 @@ class SetupFunctions
         }\r
 \r
         $this->pgsqlRunScript($sTemplate);\r
         }\r
 \r
         $this->pgsqlRunScript($sTemplate);\r

-    }  \r
+    }\r

 \r
 \r

-    private function pgsqlRunScriptFile($sFilename) {\r
+    private function pgsqlRunScriptFile($sFilename)\r
+    {\r

         if (!file_exists($sFilename)) fail('unable to find '.$sFilename);\r
 \r
         $sCMD = 'psql -p '.$this->aDSNInfo['port'].' -d '.$this->aDSNInfo['database'];\r
         if (!file_exists($sFilename)) fail('unable to find '.$sFilename);\r
 \r
         $sCMD = 'psql -p '.$this->aDSNInfo['port'].' -d '.$this->aDSNInfo['database'];\r


@@ -812,7 +831,9 @@ class SetupFunctions
             proc_close($hGzipProcess);\r
         }\r
     }\r
             proc_close($hGzipProcess);\r
         }\r
     }\r

-    private function replaceTablespace($sTemplate, $sTablespace, $sSql) {\r
+\r
+    private function replaceTablespace($sTemplate, $sTablespace, $sSql)\r
+    {\r

         if ($sTablespace) {\r
             $sSql = str_replace($sTemplate, 'TABLESPACE "'.$sTablespace.'"', $sSql);\r
         } else {\r
         if ($sTablespace) {\r
             $sSql = str_replace($sTemplate, 'TABLESPACE "'.$sTablespace.'"', $sSql);\r
         } else {\r