]> git.openstreetmap.org Git - nominatim.git/blobdiff - utils/setup.php
format change revert, removed bogus CL options, SetupClass to a new dir
[nominatim.git] / utils / setup.php
index 6afe196c8441470ddbefb8250603b26bba1caa72..63c4d2118361a15c27b4ec98e19c4eb7f0ba5eea 100755 (executable)
-#!@PHP_BIN@ -Cq\r
-<?php\r
-\r
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');\r
-require_once(CONST_BasePath.'/lib/init-cmd.php');\r
-include_once(CONST_InstallPath.'/utils/setupClass.php');\r
-// ->indirect via init-cmd.php -> /lib/cmd.php                  for runWithEnv, getCmdOpt\r
-// ->indirect via init-cmd.php -> /lib/init.php -> db.php       for &getDB()\r
-\r
-include_once(CONST_BasePath.'/lib/setup_functions.php');\r
-include_once(CONST_BasePath.'/lib/setup_functions.php');\r
-ini_set('memory_limit', '800M');\r
-\r
-\r
-$aCMDOptions = createSetupArgvArray();\r
-\r
-// $aCMDOptions passed to getCmdOpt by reference\r
-getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);\r
-\r
-\r
-$bDidSomething = false;\r
-\r
-//*******************************************************\r
-// Making some sanity check:\r
-// Check if osm-file is set and points to a valid file\r
-if ($aCMDResult['import-data'] || $aCMDResult['all']) {\r
-    // to remain in /lib/setup_functions.php function\r
-    checkInFile($aCMDResult['osm-file']);  \r
-    echo $aCMDResult['osm-file'];\r
-}\r
-\r
-// osmosis init is no longer supported\r
-if ($aCMDResult['osmosis-init']) {\r
-    $bDidSomething = true;\r
-    echo "Command 'osmosis-init' no longer available, please use utils/update.php --init-updates.\n";\r
-}\r
-\r
-// ******************************************************\r
-// instantiate Setup class\r
-$cSetup = new SetupFunctions ($aCMDResult); \r
-if ($aCMDResult['create-db'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> createDB();\r
-}\r
-\r
-// *******************************************************\r
-// go through complete process if 'all' is selected or start selected functions\r
-if ($aCMDResult['setup-db'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> setupDB();\r
-}\r
-\r
-// Try accessing the C module, so we know early if something is wrong\r
-if (!checkModulePresence()) {\r
-    fail('error loading nominatim.so module');\r
-}\r
-\r
-if ($aCMDResult['import-data'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> importData($aCMDResult['osm-file']);\r
-}\r
\r
-if ($aCMDResult['create-functions'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> createFunctions();\r
-}\r
-\r
-if ($aCMDResult['create-tables'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> createTables();\r
-}\r
-\r
-if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> createPartitionTables();\r
-}\r
-\r
-if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> createPartitionFunctions();\r
-}\r
-/*\r
-if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> importWikipediaArticles();\r
-}\r
-*/\r
-if ($aCMDResult['load-data'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> loadData($aCMDResult['disable-token-precalc']);\r
-}\r
-    \r
-if ($aCMDResult['import-tiger-data']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> importTigerData();\r
-}\r
-\r
-if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> calculatePostcodes($aCMDResult['all']);\r
-}\r
-\r
-if ($aCMDResult['index'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> index($aCMDResult['index-noanalyse']);\r
-}\r
-\r
-if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> createSearchIndices();\r
-}\r
-\r
-if ($aCMDResult['create-country-names'] || $aCMDResult['all']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> createCountryNames($aCMDResult);\r
-}\r
-\r
-if ($aCMDResult['drop']) {\r
-    $bDidSomething = true;\r
-    $cSetup -> drop($aCMDResult);\r
-}\r
-\r
-// ******************************************************\r
-// If we did something, repeat the warnings\r
-if (!$bDidSomething) {\r
-    showUsage($aCMDOptions, true);\r
-} else {\r
-    echo "Summary of warnings:\n\n";\r
-    repeatWarnings();\r
-    echo "\n";\r
-    info('Setup finished.');\r
-}\r
-\r
-\r
-\r
+#!@PHP_BIN@ -Cq
+<?php
+
+require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
+require_once(CONST_BasePath.'/lib/init-cmd.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');
+
+use Nominatim\Setup\SetupFunctions as SetupFunctions;
+
+$aCMDOptions = createSetupArgvArray();
+
+// $aCMDOptions passed to getCmdOpt by reference
+getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
+
+$bDidSomething = false;
+
+//*******************************************************
+// 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";
+}
+
+// ******************************************************
+// instantiate Setup class
+$cSetup = new SetupFunctions($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;
+    $cSetup->importData($aCMDResult['osm-file']);
+}
+
+if ($aCMDResult['create-functions'] || $aCMDResult['all']) {
+    $bDidSomething = true;
+    $cSetup->createFunctions();
+}
+
+if ($aCMDResult['create-tables'] || $aCMDResult['all']) {
+    $bDidSomething = true;
+    $cSetup->createTables();
+    $cSetup->createFunctions();
+}
+
+if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) {
+    $bDidSomething = true;
+    $cSetup->createPartitionTables();
+}
+
+if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) {
+    $bDidSomething = true;
+    $cSetup->createPartitionFunctions();
+}
+
+if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) {
+    $bDidSomething = true;
+    $cSetup->importWikipediaArticles();
+}
+
+if ($aCMDResult['load-data'] || $aCMDResult['all']) {
+    $bDidSomething = true;
+    $cSetup->loadData($aCMDResult['disable-token-precalc']);
+}
+
+if ($aCMDResult['import-tiger-data']) {
+    $bDidSomething = true;
+    $cSetup->importTigerData();
+}
+
+if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
+    $bDidSomething = true;
+    $cSetup->calculatePostcodes($aCMDResult['all']);
+}
+
+if ($aCMDResult['index'] || $aCMDResult['all']) {
+    $bDidSomething = true;
+    $cSetup->index($aCMDResult['index-noanalyse']);
+}
+
+if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {
+    $bDidSomething = true;
+    $cSetup->createSearchIndices();
+}
+
+if ($aCMDResult['create-country-names'] || $aCMDResult['all']) {
+    $bDidSomething = true;
+    $cSetup->createCountryNames($aCMDResult);
+}
+
+if ($aCMDResult['drop']) {
+    $bDidSomething = true;
+    $cSetup->drop($aCMDResult);
+}
+
+// ******************************************************
+// 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.');
+}