osm-search/Nominatim
1
1
Fork 0
mirror of https://github.com/osm-search/Nominatim.git synced 2024-12-26 06:22:13 +03:00
Code Issues Packages Projects Releases Wiki Activity

fix variable prefix

Browse Source
This commit is contained in:
Sarah Hoffmann 2018-11-20 21:07:24 +01:00
parent fb796d14ec
commit e2d0c9f3c1
1 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

34
utils/setup.php
View File

@ -71,18 +71,18 @@ if ($aCMDResult['osmosis-init']) {
// ****************************************************** // ******************************************************
// instantiate Setup class // instantiate Setup class
$cSetup = new SetupFunctions($aCMDResult); $oSetup = new SetupFunctions($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
if ($aCMDResult['create-db'] || $aCMDResult['all']) { if ($aCMDResult['create-db'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->createDB(); $oSetup->createDB();
} }
if ($aCMDResult['setup-db'] || $aCMDResult['all']) { if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->setupDB(); $oSetup->setupDB();
} }
// Try accessing the C module, so we know early if something is wrong // Try accessing the C module, so we know early if something is wrong
@ -92,68 +92,68 @@ if (!checkModulePresence()) {
if ($aCMDResult['import-data'] || $aCMDResult['all']) { if ($aCMDResult['import-data'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->importData($aCMDResult['osm-file']); $oSetup->importData($aCMDResult['osm-file']);
} }
if ($aCMDResult['create-functions'] || $aCMDResult['all']) { if ($aCMDResult['create-functions'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->createFunctions(); $oSetup->createFunctions();
} }
if ($aCMDResult['create-tables'] || $aCMDResult['all']) { if ($aCMDResult['create-tables'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->createTables(); $oSetup->createTables();
$cSetup->createFunctions(); $oSetup->createFunctions();
} }
if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) { if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->createPartitionTables(); $oSetup->createPartitionTables();
} }
if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) { if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->createPartitionFunctions(); $oSetup->createPartitionFunctions();
} }
if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) { if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->importWikipediaArticles(); $oSetup->importWikipediaArticles();
} }
if ($aCMDResult['load-data'] || $aCMDResult['all']) { if ($aCMDResult['load-data'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->loadData($aCMDResult['disable-token-precalc']); $oSetup->loadData($aCMDResult['disable-token-precalc']);
} }
if ($aCMDResult['import-tiger-data']) { if ($aCMDResult['import-tiger-data']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->importTigerData(); $oSetup->importTigerData();
} }
if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) { if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->calculatePostcodes($aCMDResult['all']); $oSetup->calculatePostcodes($aCMDResult['all']);
} }
if ($aCMDResult['index'] || $aCMDResult['all']) { if ($aCMDResult['index'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->index($aCMDResult['index-noanalyse']); $oSetup->index($aCMDResult['index-noanalyse']);
} }
if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) { if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->createSearchIndices(); $oSetup->createSearchIndices();
} }
if ($aCMDResult['create-country-names'] || $aCMDResult['all']) { if ($aCMDResult['create-country-names'] || $aCMDResult['all']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->createCountryNames($aCMDResult); $oSetup->createCountryNames($aCMDResult);
} }
if ($aCMDResult['drop']) { if ($aCMDResult['drop']) {
$bDidSomething = true; $bDidSomething = true;
$cSetup->drop($aCMDResult); $oSetup->drop($aCMDResult);
} }
// ****************************************************** // ******************************************************