From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sat, 19 Oct 2019 16:23:59 +0000 (+0200)
Subject: Merge pull request #1526 from lonvia/index-concurrently
X-Git-Tag: v3.4.0~4
X-Git-Url: https://git.openstreetmap.org./nominatim.git/commitdiff_plain/3b4ffea690fdbc84623916f968bee2ba15ee681b?hp=e3e9f696544c91c1b4ce00bdf950e1e240d85b11

Merge pull request #1526 from lonvia/index-concurrently

create/drop indexes concurrently
---

diff --git a/docs/api/Search.md b/docs/api/Search.md
index df39bba8..ace6cc8d 100644
--- a/docs/api/Search.md
+++ b/docs/api/Search.md
@@ -112,7 +112,8 @@ Limit the number of returned results. (Default: 10, Maximum: 50)
 * `viewbox=<x1>,<y1>,<x2>,<y2>`
 
 The preferred area to find search results. Any two corner points of the box
-are accepted in any order as long as they span a real box.
+are accepted in any order as long as they span a real box. `x` is longitude,
+`y` is latitude.
 
 
 * `bounded=[0|1]`
diff --git a/lib/setup/SetupClass.php b/lib/setup/SetupClass.php
index b6705968..48955248 100755
--- a/lib/setup/SetupClass.php
+++ b/lib/setup/SetupClass.php
@@ -725,9 +725,7 @@ class SetupFunctions
         }
         foreach ($aDropTables as $sDrop) {
             if ($this->bVerbose) echo "Dropping table $sDrop\n";
-            $this->oDB->exec("DROP TABLE $sDrop CASCADE");
-            // ignore warnings/errors as they might be caused by a table having
-            // been deleted already by CASCADE
+            $this->oDB->exec("DROP TABLE IF EXISTS $sDrop CASCADE");
         }
 
         if (!is_null(CONST_Osm2pgsql_Flatnode_File) && CONST_Osm2pgsql_Flatnode_File) {
diff --git a/website/search.php b/website/search.php
index 26c10122..55705656 100644
--- a/website/search.php
+++ b/website/search.php
@@ -50,6 +50,7 @@ $oGeocode->setQueryFromParams($oParams);
 
 if (!$oGeocode->getQueryString()
     && isset($_SERVER['PATH_INFO'])
+    && strlen($_SERVER['PATH_INFO']) > 0
     && $_SERVER['PATH_INFO'][0] == '/'
 ) {
     $sQuery = substr(rawurldecode($_SERVER['PATH_INFO']), 1);