switch all utils to initialising dotenv

diff --git a/lib/lib.php b/lib/lib.php
index 9f266aeb615933572783a59f6b802d32cb5af8ab..aeba499b43a62ba13bc688334388bea75735dc76 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -4,10 +4,6 @@ require('Symfony/Component/Dotenv/autoload.php');
 
 function loadSettings($sProjectDir)
 {
 
 function loadSettings($sProjectDir)
 {

-    if (!$sProjectDir) {
-        $sProjectDir = getcwd();
-    }
-

     @define('CONST_InstallDir', $sProjectDir);
 
     $dotenv = new \Symfony\Component\Dotenv\Dotenv();
     @define('CONST_InstallDir', $sProjectDir);
 
     $dotenv = new \Symfony\Component\Dotenv\Dotenv();

diff --git a/utils/check_import_finished.php b/utils/check_import_finished.php
index 6623f0c870c0a406205e698e376b7ba3a086457f..e28053be7ac0270a00f778d7a103220fa00eafdc 100755 (executable)
--- a/utils/check_import_finished.php
+++ b/utils/check_import_finished.php
@@ -2,7 +2,7 @@
 
 require_once(CONST_LibDir.'/init-cmd.php');
 
 
 require_once(CONST_LibDir.'/init-cmd.php');
 

-loadSettings(false);
+loadSettings(getcwd());

 
 $term_colors = array(
                 'green' => "\033[92m",
 
 $term_colors = array(
                 'green' => "\033[92m",

diff --git a/utils/country_languages.php b/utils/country_languages.php
index 38b79460767ad8f0168211ccbd481e6bdc53902a..1a7ea61636b89de06d0d8455ccbb63feccecb3f5 100644 (file)
--- a/utils/country_languages.php
+++ b/utils/country_languages.php
@@ -11,9 +11,11 @@ $aCMDOptions
     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('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('project-dir', '', 0, 1, 1, 1, 'realpath', 'Base directory of the Nominatim installation (default: .)'),

    );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
    );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 

+loadSettings($aCMDResult['project-dir'] ?? getcwd());

 setupHTTPProxy();
 
 if (true) {
 setupHTTPProxy();
 
 if (true) {

diff --git a/utils/export.php b/utils/export.php
index 3cf9c651b17be381418da34545946234f4bc59e4..ae18891ea9a4f79c45f935b35788d53300625d83 100644 (file)
--- a/utils/export.php
+++ b/utils/export.php
@@ -21,6 +21,7 @@
                     array('restrict-to-osm-node', '', 0, 1, 1, 1, 'int', 'Export only objects that are children of this OSM node'),
                     array('restrict-to-osm-way', '', 0, 1, 1, 1, 'int', 'Export only objects that are children of this OSM way'),
                     array('restrict-to-osm-relation', '', 0, 1, 1, 1, 'int', 'Export only objects that are children of this OSM relation'),
                     array('restrict-to-osm-node', '', 0, 1, 1, 1, 'int', 'Export only objects that are children of this OSM node'),
                     array('restrict-to-osm-way', '', 0, 1, 1, 1, 'int', 'Export only objects that are children of this OSM way'),
                     array('restrict-to-osm-relation', '', 0, 1, 1, 1, 'int', 'Export only objects that are children of this OSM relation'),

+                    array('project-dir', '', 0, 1, 1, 1, 'realpath', 'Base directory of the Nominatim installation (default: .)'),

                     "\nAddress ranks: continent, country, state, county, city, suburb, street, path",
                     'Additional output types: postcode, placeid (placeid for each object)',
                     "\noutput-format must be a semicolon-separated list of address ranks. Multiple ranks",
                     "\nAddress ranks: continent, country, state, county, city, suburb, street, path",
                     'Additional output types: postcode, placeid (placeid for each object)',
                     "\noutput-format must be a semicolon-separated list of address ranks. Multiple ranks",


@@ -30,6 +31,8 @@
                    );
     getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
                    );
     getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 

+    loadSettings($aCMDResult['project-dir'] ?? getcwd());
+

     $aRankmap = array(
                  'continent' => 1,
                  'country' => 4,
     $aRankmap = array(
                  'continent' => 1,
                  'country' => 4,

diff --git a/utils/query.php b/utils/query.php
index aa7361abd9201c8426cfba0c5f962ab221487d11..088c14ddd64ee21c216ec8a9b25b85693519a139 100644 (file)
--- a/utils/query.php
+++ b/utils/query.php
@@ -28,10 +28,14 @@ $aCMDOptions
    array('exclude_place_ids', '', 0, 1, 1, 1, 'string', 'Comma-separated list of place ids to exclude from results'),
    array('featureType', '', 0, 1, 1, 1, 'string', 'Restrict results to certain features (country, state,city,settlement)'),
    array('countrycodes', '', 0, 1, 1, 1, 'string', 'Comma-separated list of countries to restrict search to'),
    array('exclude_place_ids', '', 0, 1, 1, 1, 'string', 'Comma-separated list of place ids to exclude from results'),
    array('featureType', '', 0, 1, 1, 1, 'string', 'Restrict results to certain features (country, state,city,settlement)'),
    array('countrycodes', '', 0, 1, 1, 1, 'string', 'Comma-separated list of countries to restrict search to'),

-   array('viewbox', '', 0, 1, 1, 1, 'string', 'Prefer results in given view box')
+   array('viewbox', '', 0, 1, 1, 1, 'string', 'Prefer results in given view box'),
+
+   array('project-dir', '', 0, 1, 1, 1, 'realpath', 'Base directory of the Nominatim installation (default: .)'),

   );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
   );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 

+loadSettings($aCMDResult['project-dir'] ?? getcwd());
+

 $oDB = new Nominatim\DB;
 $oDB->connect();
 
 $oDB = new Nominatim\DB;
 $oDB->connect();
 

diff --git a/utils/setup.php b/utils/setup.php
index dfa27cb68e5d9808e49f306fce68198aba22e53d..713fe561b38df95ce87d462e3ec98f9f4cd28bfe 100644 (file)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -44,13 +44,13 @@ $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('setup-website', '', 0, 1, 0, 0, 'bool', 'Used to compile environment variables for the website'),
    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('setup-website', '', 0, 1, 0, 0, 'bool', 'Used to compile environment variables for the website'),

-   array('project-dir', '', 0, 1, 1, 1, 'realpath', 'Base directory for this Nominatim installation'),
+   array('project-dir', '', 0, 1, 1, 1, 'realpath', 'Base directory of the Nominatim installation (default: .)'),

   );
 
 // $aCMDOptions passed to getCmdOpt by reference
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
   );
 
 // $aCMDOptions passed to getCmdOpt by reference
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 

-loadSettings($aCMDResult['project-dir'] ?? false);
+loadSettings($aCMDResult['project-dir'] ?? getcwd());

 setupHTTPProxy();
 
 $bDidSomething = false;
 setupHTTPProxy();
 
 $bDidSomething = false;

diff --git a/utils/specialphrases.php b/utils/specialphrases.php
index 58e06222b31015d92d43ad9d920d3ab9e9c741ce..8e8ea63c6763d58057bda8cfe534e9b9131a3565 100644 (file)
--- a/utils/specialphrases.php
+++ b/utils/specialphrases.php
@@ -11,9 +11,11 @@ $aCMDOptions
    array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
    array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
    array('wiki-import', '', 0, 1, 0, 0, 'bool', 'Create import script for search phrases '),
    array('quiet', 'q', 0, 1, 0, 0, 'bool', 'Quiet output'),
    array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
    array('wiki-import', '', 0, 1, 0, 0, 'bool', 'Create import script for search phrases '),

+   array('project-dir', '', 0, 1, 1, 1, 'realpath', 'Base directory of the Nominatim installation (default: .)'),

   );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 
   );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aCMDResult, true, true);
 

+loadSettings($aCMDResult['project-dir'] ?? getcwd());

 setupHTTPProxy();
 
 include(getSettingConfig('PHRASE_CONFIG', 'phrase_settings.php'));
 setupHTTPProxy();
 
 include(getSettingConfig('PHRASE_CONFIG', 'phrase_settings.php'));

diff --git a/utils/update.php b/utils/update.php
index 7f9b7a2dc2c22405553a8ebc357579f7526c9e17..931ca179819cd9b8577062dca3ac9785069c0c67 100644 (file)
--- a/utils/update.php
+++ b/utils/update.php
@@ -41,11 +41,14 @@ $aCMDOptions
 
    array('recompute-word-counts', '', 0, 1, 0, 0, 'bool', 'Compute frequency of full-word search terms'),
    array('update-address-levels', '', 0, 1, 0, 0, 'bool', 'Reimport address level configuration (EXPERT)'),
 
    array('recompute-word-counts', '', 0, 1, 0, 0, 'bool', 'Compute frequency of full-word search terms'),
    array('update-address-levels', '', 0, 1, 0, 0, 'bool', 'Reimport address level configuration (EXPERT)'),

-   array('recompute-importance', '', 0, 1, 0, 0, 'bool', 'Recompute place importances')
+   array('recompute-importance', '', 0, 1, 0, 0, 'bool', 'Recompute place importances'),
+
+   array('project-dir', '', 0, 1, 1, 1, 'realpath', 'Base directory of the Nominatim installation (default: .)'),

   );
 
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
 
   );
 
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
 

+loadSettings($aCMDResult['project-dir'] ?? getcwd());

 setupHTTPProxy();
 
 if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;
 setupHTTPProxy();
 
 if (!isset($aResult['index-instances'])) $aResult['index-instances'] = 1;

diff --git a/utils/warm.php b/utils/warm.php
index f86e0dd5821fb0feedb032d7df82cb38215a5961..0d8260f199ceaa0c411f0a7436650f93c23ef60b 100644 (file)
--- a/utils/warm.php
+++ b/utils/warm.php
@@ -1,6 +1,11 @@
 <?php
 
 require_once(CONST_LibDir.'/init-cmd.php');
 <?php
 
 require_once(CONST_LibDir.'/init-cmd.php');

+require_once(CONST_LibDir.'/log.php');
+require_once(CONST_LibDir.'/Geocode.php');
+require_once(CONST_LibDir.'/PlaceLookup.php');
+require_once(CONST_LibDir.'/ReverseGeocode.php');
+

 ini_set('memory_limit', '800M');
 
 $aCMDOptions = array(
 ini_set('memory_limit', '800M');
 
 $aCMDOptions = array(


@@ -10,13 +15,11 @@ $aCMDOptions = array(
                 array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
                 array('reverse-only', '', 0, 1, 0, 0, 'bool', 'Warm reverse only'),
                 array('search-only', '', 0, 1, 0, 0, 'bool', 'Warm search only'),
                 array('verbose', 'v', 0, 1, 0, 0, 'bool', 'Verbose output'),
                 array('reverse-only', '', 0, 1, 0, 0, 'bool', 'Warm reverse only'),
                 array('search-only', '', 0, 1, 0, 0, 'bool', 'Warm search only'),

+                array('project-dir', '', 0, 1, 1, 1, 'realpath', 'Base directory of the Nominatim installation (default: .)'),

                );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
 
                );
 getCmdOpt($_SERVER['argv'], $aCMDOptions, $aResult, true, true);
 

-require_once(CONST_LibDir.'/log.php');
-require_once(CONST_LibDir.'/Geocode.php');
-require_once(CONST_LibDir.'/PlaceLookup.php');
-require_once(CONST_LibDir.'/ReverseGeocode.php');
+loadSettings($aCMDResult['project-dir'] ?? getcwd());

 
 $oDB = new Nominatim\DB();
 $oDB->connect();
 
 $oDB = new Nominatim\DB();
 $oDB->connect();