fix variable prefix

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index a5512de073d27621e4a47cc0ae90258585e3c000..00ad90cc6dcb29b1f2e3472cf3c7e6d569a41b6f 100755 (executable)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -3,11 +3,16 @@
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');
 
 require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
 require_once(CONST_BasePath.'/lib/init-cmd.php');

-include_once(CONST_InstallPath.'/utils/setup_functions.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/SetupClass.php');
+require_once(CONST_BasePath.'/lib/setup_functions.php');

 ini_set('memory_limit', '800M');
 
 ini_set('memory_limit', '800M');
 

-# (long-opt, short-opt, min-occurs, max-occurs, num-arguments, num-arguments, type, help)
+use Nominatim\Setup\SetupFunctions as SetupFunctions;

 
 

+// (long-opt, short-opt, min-occurs, max-occurs, num-arguments, num-arguments, type, help)

 $aCMDOptions
 = array(
    'Create and setup nominatim search system',
 $aCMDOptions
 = array(
    'Create and setup nominatim search system',


@@ -44,92 +49,120 @@ $aCMDOptions
    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)'),
   );
    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)'),
   );

+
+// $aCMDOptions passed to getCmdOpt by reference

 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
 $bDidSomething = false;
 
 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
+$oSetup = 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;
+    $oSetup->createDB();
+}
+
+if ($aCMDResult['setup-db'] || $aCMDResult['all']) {
+    $bDidSomething = true;
+    $oSetup->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;
 
 if ($aCMDResult['import-data'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    import_data($aCMDResult, $iCacheMemory, $aDSNInfo);
+    $oSetup->importData($aCMDResult['osm-file']);

 }
 
 if ($aCMDResult['create-functions'] || $aCMDResult['all']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['create-functions'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    create_functions ($aCMDResult);
+    $oSetup->createFunctions();

 }
 
 if ($aCMDResult['create-tables'] || $aCMDResult['all']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['create-tables'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    create_tables($aCMDResult);
+    $oSetup->createTables();
+    $oSetup->createFunctions();

 }
 
 if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['create-partition-tables'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    create_partition_tables($aCMDResult);
+    $oSetup->createPartitionTables();

 }
 
 if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['create-partition-functions'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    create_partition_functions();
+    $oSetup->createPartitionFunctions();

 }
 
 if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['import-wikipedia-articles'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    import_wikipedia_articles();
+    $oSetup->importWikipediaArticles();

 }
 
 }
 

-

 if ($aCMDResult['load-data'] || $aCMDResult['all']) {
     $bDidSomething = true;
 if ($aCMDResult['load-data'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    load_data($aCMDResult, $iInstances);
+    $oSetup->loadData($aCMDResult['disable-token-precalc']);

 }
 
 if ($aCMDResult['import-tiger-data']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['import-tiger-data']) {
     $bDidSomething = true;

-    import_tiger_data($iInstances);
+    $oSetup->importTigerData();

 }
 
 if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['calculate-postcodes'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    calculate_postcodes($aCMDResult);
-}
-
-if ($aCMDResult['osmosis-init']) {
-    $bDidSomething = true;
-    osmosis_init();
+    $oSetup->calculatePostcodes($aCMDResult['all']);

 }
 
 if ($aCMDResult['index'] || $aCMDResult['all']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['index'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    index($aCMDResult, $aDSNInfo, $iInstances);
+    $oSetup->index($aCMDResult['index-noanalyse']);

 }
 
 if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    create_search_indices($aCMDResult);
+    $oSetup->createSearchIndices();

 }
 
 if ($aCMDResult['create-country-names'] || $aCMDResult['all']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['create-country-names'] || $aCMDResult['all']) {
     $bDidSomething = true;

-    create_country_names();
+    $oSetup->createCountryNames($aCMDResult);

 }
 
 if ($aCMDResult['drop']) {
     $bDidSomething = true;
 }
 
 if ($aCMDResult['drop']) {
     $bDidSomething = true;

-    drop($aCMDResult);
+    $oSetup->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.');
+}