linking: better name matching for address-less places

[nominatim.git] / utils / check_import_finished.php

diff --git a/utils/check_import_finished.php b/utils/check_import_finished.php
index 82d5b509ddc47e12fa9b9389c819bbe4d670e8c8..b81cace1702d3af50392d7682d56c3f11fbbe9ba 100755 (executable)
--- a/utils/check_import_finished.php
+++ b/utils/check_import_finished.php
@@ -20,6 +20,13 @@ $print_fail = function ($message = 'Failed') use ($term_colors) {
 $oDB = new Nominatim\DB;
 
 
 $oDB = new Nominatim\DB;
 
 

+function isReverseOnlyInstallation()
+{
+    global $oDB;
+    return !$oDB->tableExists('search_name');
+}
+
+

 echo 'Checking database got created ... ';
 if ($oDB->databaseExists()) {
     $print_success();
 echo 'Checking database got created ... ';
 if ($oDB->databaseExists()) {
     $print_success();


@@ -107,13 +114,16 @@ $aExpectedIndices = array(
     'idx_osmline_parent_osm_id',
     'idx_place_osm_unique',
     'idx_postcode_id',
     'idx_osmline_parent_osm_id',
     'idx_place_osm_unique',
     'idx_postcode_id',

-    'idx_postcode_postcode',
-
-    // sql/indices_search.src.sql
-    'idx_search_name_nameaddress_vector',
-    'idx_search_name_name_vector',
-    'idx_search_name_centroid'
+    'idx_postcode_postcode'

 );
 );

+if (!isReverseOnlyInstallation()) {
+    $aExpectedIndices = array_merge($aExpectedIndices, array(
+        // sql/indices_search.src.sql
+        'idx_search_name_nameaddress_vector',
+        'idx_search_name_name_vector',
+        'idx_search_name_centroid'
+    ));
+}

 
 foreach ($aExpectedIndices as $sExpectedIndex) {
     echo "Checking index $sExpectedIndex ... ";
 
 foreach ($aExpectedIndices as $sExpectedIndex) {
     echo "Checking index $sExpectedIndex ... ";


@@ -144,7 +154,8 @@ if (empty($aInvalid)) {
     $print_fail();
     echo <<< END
     At least one index is invalid. That can happen, e.g. when index creation was
     $print_fail();
     echo <<< END
     At least one index is invalid. That can happen, e.g. when index creation was

-    disrupted and later restarted. You should run the index stage of setup again.
+    disrupted and later restarted. You should delete the affected indices and
+    run the index stage of setup again.

     See the question 'Can a stopped/killed import process be resumed?' in the
     troubleshooting guide.
     Affected indices: 
     See the question 'Can a stopped/killed import process be resumed?' in the
     troubleshooting guide.
     Affected indices: