Merge remote-tracking branch 'upstream/master'

[nominatim.git] / utils / setup.php

diff --git a/utils/setup.php b/utils/setup.php
index 90df0835cead3878be20101e221f19684a8fff2f..3015f13a45e7dd5d2befb7fdb88df60973b2e0bd 100644 (file)
--- a/utils/setup.php
+++ b/utils/setup.php
@@ -138,6 +138,11 @@ if ($aCMDResult['index'] || $aCMDResult['all']) {
     $oSetup->index($aCMDResult['index-noanalyse']);
 }
 
     $oSetup->index($aCMDResult['index-noanalyse']);
 }
 

+if ($aCMDResult['drop']) {
+    $bDidSomething = true;
+    $oSetup->drop($aCMDResult);
+}
+

 if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {
     $bDidSomething = true;
     $oSetup->createSearchIndices();
 if ($aCMDResult['create-search-indices'] || $aCMDResult['all']) {
     $bDidSomething = true;
     $oSetup->createSearchIndices();


@@ -148,11 +153,6 @@ if ($aCMDResult['create-country-names'] || $aCMDResult['all']) {
     $oSetup->createCountryNames($aCMDResult);
 }
 
     $oSetup->createCountryNames($aCMDResult);
 }
 

-if ($aCMDResult['drop']) {
-    $bDidSomething = true;
-    $oSetup->drop($aCMDResult);
-}
-

 // ******************************************************
 // If we did something, repeat the warnings
 if (!$bDidSomething) {
 // ******************************************************
 // If we did something, repeat the warnings
 if (!$bDidSomething) {