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 6623f0c870c0a406205e698e376b7ba3a086457f..bd5d7a00216a20e76dacfcc5b28feeda419193e1 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');
 
-loadSettings(false);
+loadSettings(getcwd());
 
 $term_colors = array(
                 'green' => "\033[92m",
@@ -28,6 +28,13 @@ function isReverseOnlyInstallation()
     return !$oDB->tableExists('search_name');
 }
 
+// Check (guess) if the setup.php included --drop
+function isNoUpdateInstallation()
+{
+    global $oDB;
+    return $oDB->tableExists('placex') && !$oDB->tableExists('planet_osm_rels') ;
+}
+
 
 echo 'Checking database got created ... ';
 if ($oDB->checkConnection()) {
@@ -63,27 +70,28 @@ END;
     exit(1);
 }
 
-echo 'Checking place table ... ';
-if ($oDB->tableExists('place')) {
-    $print_success();
-} else {
-    $print_fail();
-    echo <<< END
-    * The import didn't finish.
-    Hints:
-    * Check the output of the utils/setup.php you ran.
-    Usually the osm2pgsql step failed. Check for errors related to
-    * the file you imported not containing any places
-    * harddrive full
-    * out of memory (RAM)
-    * osm2pgsql killed by other scripts, for consuming to much memory
-
-END;
-    exit(1);
+if (!isNoUpdateInstallation()) {
+    echo 'Checking place table ... ';
+    if ($oDB->tableExists('place')) {
+        $print_success();
+    } else {
+        $print_fail();
+        echo <<< END
+        * The import didn't finish.
+        Hints:
+        * Check the output of the utils/setup.php you ran.
+        Usually the osm2pgsql step failed. Check for errors related to
+        * the file you imported not containing any places
+        * harddrive full
+        * out of memory (RAM)
+        * osm2pgsql killed by other scripts, for consuming to much memory
+
+    END;
+        exit(1);
+    }
 }
 
 
-
 echo 'Checking indexing status ... ';
 $iUnindexed = $oDB->getOne('SELECT count(*) FROM placex WHERE indexed_status > 0');
 if ($iUnindexed == 0) {
@@ -106,14 +114,11 @@ $aExpectedIndices = array(
     'idx_place_addressline_address_place_id',
     'idx_placex_rank_search',
     'idx_placex_rank_address',
-    'idx_placex_pendingsector',
     'idx_placex_parent_place_id',
     'idx_placex_geometry_reverse_lookuppolygon',
     'idx_placex_geometry_reverse_placenode',
-    'idx_location_area_country_place_id',
     'idx_osmline_parent_place_id',
     'idx_osmline_parent_osm_id',
-    'idx_place_osm_unique',
     'idx_postcode_id',
     'idx_postcode_postcode'
 );
@@ -125,6 +130,13 @@ if (!isReverseOnlyInstallation()) {
         'idx_search_name_centroid'
     ));
 }
+if (!isNoUpdateInstallation()) {
+    $aExpectedIndices = array_merge($aExpectedIndices, array(
+        'idx_placex_pendingsector',
+        'idx_location_area_country_place_id',
+        'idx_place_osm_unique',
+    ));
+}
 
 foreach ($aExpectedIndices as $sExpectedIndex) {
     echo "Checking index $sExpectedIndex ... ";