require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
require_once(CONST_BasePath.'/lib/init-cmd.php');
-include_once(CONST_InstallPath.'/utils/setup_functions.php');
+require_once(CONST_BasePath.'/lib/classes/SetupClass.php');
+// ->indirect via init-cmd.php->/lib/cmd.php for runWithEnv, getCmdOpt
+// ->indirect via init-cmd.php->/lib/init.php->db.php for &getDB()
+require_once(CONST_BasePath.'/lib/setup_functions.php');
ini_set('memory_limit', '800M');
-# (long-opt, short-opt, min-occurs, max-occurs, num-arguments, num-arguments, type, help)
-
-$aCMDOptions
-= array(
- 'Create and setup nominatim search system',
- array('help', 'h', 0, 1, 0, 0, false, 'Show Help'),
- array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
- array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
-
- array('osm-file', '', 0, 1, 1, 1, 'realpath', 'File to import'),
- array('threads', '', 0, 1, 1, 1, 'int', 'Number of threads (where possible)'),
-
- array('all', '', 0, 1, 0, 0, 'bool', 'Do the complete process'),
-
- array('create-db', '', 0, 1, 0, 0, 'bool', 'Create nominatim db'),
- array('setup-db', '', 0, 1, 0, 0, 'bool', 'Build a blank nominatim db'),
- array('import-data', '', 0, 1, 0, 0, 'bool', 'Import a osm file'),
- array('osm2pgsql-cache', '', 0, 1, 1, 1, 'int', 'Cache size used by osm2pgsql'),
- array('create-functions', '', 0, 1, 0, 0, 'bool', 'Create functions'),
- array('enable-diff-updates', '', 0, 1, 0, 0, 'bool', 'Turn on the code required to make diff updates work'),
- array('enable-debug-statements', '', 0, 1, 0, 0, 'bool', 'Include debug warning statements in pgsql commands'),
- array('ignore-errors', '', 0, 1, 0, 0, 'bool', 'Continue import even when errors in SQL are present (EXPERT)'),
- array('create-tables', '', 0, 1, 0, 0, 'bool', 'Create main tables'),
- array('create-partition-tables', '', 0, 1, 0, 0, 'bool', 'Create required partition tables'),
- array('create-partition-functions', '', 0, 1, 0, 0, 'bool', 'Create required partition triggers'),
- array('no-partitions', '', 0, 1, 0, 0, 'bool', 'Do not partition search indices (speeds up import of single country extracts)'),
- array('import-wikipedia-articles', '', 0, 1, 0, 0, 'bool', 'Import wikipedia article dump'),
- array('load-data', '', 0, 1, 0, 0, 'bool', 'Copy data to live tables from import table'),
- array('disable-token-precalc', '', 0, 1, 0, 0, 'bool', 'Disable name precalculation (EXPERT)'),
- array('import-tiger-data', '', 0, 1, 0, 0, 'bool', 'Import tiger data (not included in \'all\')'),
- array('calculate-postcodes', '', 0, 1, 0, 0, 'bool', 'Calculate postcode centroids'),
- array('osmosis-init', '', 0, 1, 0, 0, 'bool', 'Generate default osmosis configuration'),
- array('index', '', 0, 1, 0, 0, 'bool', 'Index the data'),
- array('index-noanalyse', '', 0, 1, 0, 0, 'bool', 'Do not perform analyse operations during index (EXPERT)'),
- array('create-search-indices', '', 0, 1, 0, 0, 'bool', 'Create additional indices required for search and update'),
- array('create-country-names', '', 0, 1, 0, 0, 'bool', 'Create default list of searchable country names'),
- array('drop', '', 0, 1, 0, 0, 'bool', 'Drop tables needed for updates, making the database readonly (EXPERIMENTAL)'),
- );
+use Nominatim\Setup\SetupFunctions as SetupFunctions;
+
+$aCMDOptions = createSetupArgvArray();
+
+// $aCMDOptions passed to getCmdOpt by reference
getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
$bDidSomething = false;
-// Check if osm-file is set and points to a valid file if --all or --import-data is given
-checkInFile($aCMDResult);
+//*******************************************************
+// Making some sanity check:
+// Check if osm-file is set and points to a valid file
+if ($aCMDResult['import-data'] || $aCMDResult['all']) {
+ // to remain in /lib/setup_functions.php function
+ checkInFile($aCMDResult['osm-file']);
+}
+
+// osmosis init is no longer supported
+if ($aCMDResult['osmosis-init']) {
+ $bDidSomething = true;
+ echo "Command 'osmosis-init' no longer available, please use utils/update.php --init-updates.\n";
+}
-// get info how many processors and huch much cache mem we can use
-$prepSreturn = prepSystem($aCMDResult);
-$iCacheMemory = $prepSreturn[0];
-$iInstances = $prepSreturn[1];
+// ******************************************************
+// instantiate Setup class
+$cSetup = new SetupFunctions($aCMDResult);
-// prepares DB for import or update, returns Data Source Name
-$aDSNInfo = prepDB($aCMDResult);
+// *******************************************************
+// go through complete process if 'all' is selected or start selected functions
+if ($aCMDResult['create-db'] || $aCMDResult['all']) {
+ $bDidSomething = true;
+ $cSetup->createDB();
+}
+
+if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
+ $bDidSomething = true;
+ $cSetup->setupDB();
+}
+
+// Try accessing the C module, so we know early if something is wrong
+if (!checkModulePresence()) {
+ fail('error loading nominatim.so module');
+}
if ($aCMDResult['import-data'] || $aCMDResult['all']) {
$bDidSomething = true;
- import_data($aCMDResult, $iCacheMemory, $aDSNInfo);
+ $cSetup->importData($aCMDResult['osm-file']);
}
if ($aCMDResult['create-functions'] || $aCMDResult['all']) {
$bDidSomething = true;
- create_functions ($aCMDResult);
+ $cSetup->createFunctions();
}
if ($aCMDResult['create-tables'] || $aCMDResult['all']) {
$bDidSomething = true;
- create_tables($aCMDResult);
+ $cSetup->createTables();
+ $cSetup->createFunctions();
}
if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) {
$bDidSomething = true;
- create_partition_tables($aCMDResult);
+ $cSetup->createPartitionTables();
}
if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) {
$bDidSomething = true;
- create_partition_functions();
+ $cSetup->createPartitionFunctions();
}
if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) {
$bDidSomething = true;
- import_wikipedia_articles();
+ $cSetup->importWikipediaArticles();
}
-
if ($aCMDResult['load-data'] || $aCMDResult['all']) {
$bDidSomething = true;
- load_data($aCMDResult, $iInstances);
+ $cSetup->loadData($aCMDResult['disable-token-precalc']);
}
if ($aCMDResult['import-tiger-data']) {
$bDidSomething = true;
- import_tiger_data($iInstances);
+ $cSetup->importTigerData();
}
if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
$bDidSomething = true;
- calculate_postcodes($aCMDResult);
-}
-
-if ($aCMDResult['osmosis-init']) {
- $bDidSomething = true;
- osmosis_init();
+ $cSetup->calculatePostcodes($aCMDResult['all']);
}
if ($aCMDResult['index'] || $aCMDResult['all']) {
$bDidSomething = true;
- index($aCMDResult, $aDSNInfo, $iInstances);
+ $cSetup->index($aCMDResult['index-noanalyse']);
}
if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {
$bDidSomething = true;
- create_search_indices($aCMDResult);
+ $cSetup->createSearchIndices();
}
if ($aCMDResult['create-country-names'] || $aCMDResult['all']) {
$bDidSomething = true;
- create_country_names();
+ $cSetup->createCountryNames($aCMDResult);
}
if ($aCMDResult['drop']) {
$bDidSomething = true;
- drop($aCMDResult);
+ $cSetup->drop($aCMDResult);
}
-didsomething($bDidSomething);
-
-
+// ******************************************************
+// If we did something, repeat the warnings
+if (!$bDidSomething) {
+ showUsage($aCMDOptions, true);
+} else {
+ echo "Summary of warnings:\n\n";
+ repeatWarnings();
+ echo "\n";
+ info('Setup finished.');
+}
projects / nominatim.git / blobdiff