From f7204a2ddc3a8115651b9bca2c29e735034cfa21 Mon Sep 17 00:00:00 2001
From: zsloan
Date: Thu, 15 Aug 2019 21:15:23 -0500
Subject: Fixed bug related to adding LOD search that caused non-keyword
 searches to not work

---
 wqflask/wqflask/do_search.py      | 2 +-
 wqflask/wqflask/search_results.py | 2 ++
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'wqflask')

diff --git a/wqflask/wqflask/do_search.py b/wqflask/wqflask/do_search.py
index 2eac4bb3..8476649f 100644
--- a/wqflask/wqflask/do_search.py
+++ b/wqflask/wqflask/do_search.py
@@ -70,7 +70,7 @@ class DoSearch(object):
         logger.debug("search_types are:", pf(cls.search_types))
 
         search_type_string = search_type['dataset_type']
-        if 'key' in search_type:
+        if 'key' in search_type and search_type['key'] != None:
             search_type_string += '_' + search_type['key']
 
         logger.debug("search_type_string is:", search_type_string)
diff --git a/wqflask/wqflask/search_results.py b/wqflask/wqflask/search_results.py
index be06b390..33515e25 100644
--- a/wqflask/wqflask/search_results.py
+++ b/wqflask/wqflask/search_results.py
@@ -219,6 +219,8 @@ views.py).
         search_type['dataset_type'] = self.dataset.type
         if a_search['key']:
             search_type['key'] = a_search['key'].upper()
+        else:
+            search_type['key'] = None
         logger.debug("search_type is:", pf(search_type))
 
         search_ob = do_search.DoSearch.get_search(search_type)
-- 
cgit v1.2.3