mirror of
https://github.com/osm-search/Nominatim.git
synced 2026-03-09 11:34:07 +00:00
change variables for class SetupClass.php instantiation
This commit is contained in:
@@ -16,7 +16,7 @@ class SetupFunctions
|
|||||||
protected $oDB = null; // set in setupDB (earliest) or later in loadData, importData, drop, createSqlFunctions, importTigerData
|
protected $oDB = null; // set in setupDB (earliest) or later in loadData, importData, drop, createSqlFunctions, importTigerData
|
||||||
// pgsqlRunPartitionScript, calculatePostcodes, ..if no already set
|
// 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.
|
// by default, use all but one processor, but never more than 15.
|
||||||
$this->iInstances = isset($aCMDResult['threads'])
|
$this->iInstances = isset($aCMDResult['threads'])
|
||||||
|
|||||||
@@ -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
|
||||||
|
|||||||
@@ -106,7 +106,7 @@ if ($aResult['init-updates']) {
|
|||||||
|
|
||||||
if (!$aResult['no-update-functions']) {
|
if (!$aResult['no-update-functions']) {
|
||||||
// instantiate setupClass to use the function therein
|
// instantiate setupClass to use the function therein
|
||||||
$cSetup = new SetupFunctions($aResult, 'update');
|
$cSetup = new SetupFunctions('update');
|
||||||
$cSetup->createFunctions();
|
$cSetup->createFunctions();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user