switch remaining settings to dotenv format

[nominatim.git] / utils / check_import_finished.php

diff --git a/utils/check_import_finished.php b/utils/check_import_finished.php
index 4529c69394b53c8cab1e50775c549fe516d942c5..6623f0c870c0a406205e698e376b7ba3a086457f 100755 (executable)
--- a/utils/check_import_finished.php
+++ b/utils/check_import_finished.php
@@ -1,6 +1,8 @@
 <?php
 
 <?php
 

-require_once(CONST_BasePath.'/lib/init-cmd.php');
+require_once(CONST_LibDir.'/init-cmd.php');
+
+loadSettings(false);

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


@@ -35,7 +37,7 @@ if ($oDB->checkConnection()) {
     echo <<< END
     Hints:
     * Is the database server started?
     echo <<< END
     Hints:
     * Is the database server started?

-    * Check the CONST_Database_DSN variable in build/settings/local.php
+    * Check the NOMINATIM_DATABASE_DSN variable in your local .env

     * Try connecting to the database with the same settings
 
 END;
     * Try connecting to the database with the same settings
 
 END;


@@ -106,7 +108,6 @@ $aExpectedIndices = array(
     'idx_placex_rank_address',
     'idx_placex_pendingsector',
     'idx_placex_parent_place_id',
     'idx_placex_rank_address',
     'idx_placex_pendingsector',
     'idx_placex_parent_place_id',

-    'idx_placex_geometry_reverse_lookuppoint',

     'idx_placex_geometry_reverse_lookuppolygon',
     'idx_placex_geometry_reverse_placenode',
     'idx_location_area_country_place_id',
     'idx_placex_geometry_reverse_lookuppolygon',
     'idx_placex_geometry_reverse_placenode',
     'idx_location_area_country_place_id',


@@ -133,7 +134,8 @@ foreach ($aExpectedIndices as $sExpectedIndex) {
         $print_fail();
         echo <<< END
         Hints:
         $print_fail();
         echo <<< END
         Hints:

-        * Rerun the setup.php --create-search-indices step
+        * Run './utils/setup.php --create-search-indices --ignore-errors' to
+          create missing indices.

 
 END;
         exit(1);
 
 END;
         exit(1);


@@ -166,7 +168,7 @@ END;
 
 
 
 
 
 

-if (CONST_Use_US_Tiger_Data) {
+if (getSettingBool('USE_US_TIGER_DATA')) {

     echo 'Checking TIGER table exists ... ';
     if ($oDB->tableExists('location_property_tiger')) {
         $print_success();
     echo 'Checking TIGER table exists ... ';
     if ($oDB->tableExists('location_property_tiger')) {
         $print_success();