Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / check_import_finished.php

diff --git a/utils/check_import_finished.php b/utils/check_import_finished.php
index b81cace1702d3af50392d7682d56c3f11fbbe9ba..5ec99b81eb2a8164251a12b1888cdc4b0e50ceb5 100755 (executable)
--- a/utils/check_import_finished.php
+++ b/utils/check_import_finished.php
@@ -28,7 +28,7 @@ function isReverseOnlyInstallation()
 
 
 echo 'Checking database got created ... ';
 
 
 echo 'Checking database got created ... ';

-if ($oDB->databaseExists()) {
+if ($oDB->checkConnection()) {

     $print_success();
 } else {
     $print_fail();
     $print_success();
 } else {
     $print_fail();


@@ -106,7 +106,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 +132,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);