change variables for class SetupClass.php instantiation

diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index f31c235304223ed11bf9cffa1e7300861140d213..3b4f683d544b89184b9587d0085d396493603664 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'])

diff --git a/utils/setup.php b/utils/setup.php
index 5bc2a6f93e11c73bf691d8cf40be93ac5a4d4443..bdd3f03badceca376004ecdb867ad5868692c741 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -71,7 +71,7 @@ if ($aCMDResult['osmosis-init']) {
 
 // ******************************************************
 // instantiate Setup class
 
 // ******************************************************
 // instantiate Setup class

-$cSetup = new SetupFunctions($aCMDResult);
+$cSetup = new SetupFunctions('setup', $aCMDResult);

 
 // *******************************************************
 // go through complete process if 'all' is selected or start selected functions
 
 // *******************************************************
 // go through complete process if 'all' is selected or start selected functions

diff --git a/utils/update.php b/utils/update.php
index 9175a617a2c454dc6ccd93e8c1157b677f3ccd3a..dc8389abcf24800457448f3fa44ae770885cbe15 100755 (executable)
--- a/utils/update.php
+++ b/utils/update.php
@@ -106,7 +106,7 @@ if ($aResult['init-updates']) {
 
     if (!$aResult['no-update-functions']) {
         // instantiate setupClass to use the function therein
 
     if (!$aResult['no-update-functions']) {
         // instantiate setupClass to use the function therein

-        $cSetup = new SetupFunctions($aResult, 'update');
+        $cSetup = new SetupFunctions('update');

         $cSetup->createFunctions();
     }
 
         $cSetup->createFunctions();
     }