Merge branch 'updatePHP' of https://github.com/ThomasBarris/Nominatim into ThomasBarr...

[nominatim.git] / lib / setup / SetupClass.php

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index f31c235304223ed11bf9cffa1e7300861140d213..fbcf9b5c7bb67aa146d4f00c67450be4102d5f42 100755 (executable)
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -16,7 +16,7 @@ class SetupFunctions
     protected $oDB = null;              // set in setupDB (earliest) or later in loadData, importData, drop, createSqlFunctions, importTigerData
                                                 // pgsqlRunPartitionScript, calculatePostcodes, ..if no already set
 
     protected $oDB = null;              // set in setupDB (earliest) or later in loadData, importData, drop, createSqlFunctions, importTigerData
                                                 // pgsqlRunPartitionScript, calculatePostcodes, ..if no already set
 

-    public function __construct($aCMDResult, $callingFunction = 'setup')
+    public function __construct($callingFunction, array $aCMDResult = array())

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


@@ -64,7 +64,7 @@ class SetupFunctions
         }
 
         // if class is instantiated by update.php, we have to set EnableDiffUpdates to true
         }
 
         // if class is instantiated by update.php, we have to set EnableDiffUpdates to true

-        // otherwise set to value provided comand line to setup.php
+        // otherwise set to value provided by setup.php's command line arg array

         if ($callingFunction == 'update') {
             $this->bEnableDiffUpdates = true;
         } elseif ($callingFunction == 'setup') {
         if ($callingFunction == 'update') {
             $this->bEnableDiffUpdates = true;
         } elseif ($callingFunction == 'setup') {