From 4642948638b80125c7b9f2186fc288dd5f82188e Mon Sep 17 00:00:00 2001
From: Alexey Zakharenkov
 <35913079+alexey-zakharenkov@users.noreply.github.com>
Date: Wed, 30 Dec 2020 18:44:18 +0300
Subject: [PATCH] Elaborate search endpoint

---
 web/app/borders_api.py         | 23 ++++++++++++++---------
 web/app/countries_structure.py |  2 +-
 web/app/templates/index.html   |  2 +-
 3 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/web/app/borders_api.py b/web/app/borders_api.py
index 2413306..cd04e34 100755
--- a/web/app/borders_api.py
+++ b/web/app/borders_api.py
@@ -218,17 +218,22 @@ def get_server_configuration():
                    mwm_size_thr=config.MWM_SIZE_THRESHOLD)
 
 
+def prepare_sql_search_string(string):
+    if string.startswith('^'):
+        string = string[1:]
+    else:
+        string = f"%{string}"
+    if string.endswith('$'):
+        string = string[:-1]
+    else:
+        string = f"{string}%"
+    return string
+
+
 @app.route('/search')
 def search():
     query = request.args.get('q')
-    if query.startswith('^'):
-        query = query[1:]
-    else:
-        query = f"%{query}"
-    if query.endswith('$'):
-        query = query[:-1]
-    else:
-        query = f"{query}%"
+    sql_search_string = prepare_sql_search_string(query)
 
     with g.conn.cursor() as cursor:
         cursor.execute(f"""
@@ -236,7 +241,7 @@ def search():
             FROM {config.BORDERS_TABLE}
             WHERE name ILIKE %s
             ORDER BY (ST_Area(geography(geom)))
-            LIMIT 1""", (query,)
+            LIMIT 1""", (sql_search_string,)
         )
         if cursor.rowcount > 0:
             rec = cursor.fetchone()
diff --git a/web/app/countries_structure.py b/web/app/countries_structure.py
index addfe6d..5567cb4 100644
--- a/web/app/countries_structure.py
+++ b/web/app/countries_structure.py
@@ -43,7 +43,7 @@ def create_countries_initial_structure(conn):
     with conn.cursor() as cursor:
         # TODO: process overlapping countries, like Ukraine and Russia with common Crimea
         cursor.execute(f"""
-            SELECT osm_id, name
+            SELECT osm_id
             FROM {osm_table}
             WHERE admin_level = 2
             """
diff --git a/web/app/templates/index.html b/web/app/templates/index.html
index e595049..669416f 100644
--- a/web/app/templates/index.html
+++ b/web/app/templates/index.html
@@ -210,7 +210,7 @@
             <span id="wait_start_over">ожидайте...</span>
         </div>
         <div id="search">
-            Поиск <input type="text" id="fsearch">
+            Поиск <input type="text" id="fsearch" placeholder="Use ^/$ for start/end">
             <button id="b_search" onclick="doSearch()">&#x1f50d;</button>
         </div>
     </div>