feat: Add fallback when redisearch not loaded
diff --git a/erpnext/templates/pages/product_search.py b/erpnext/templates/pages/product_search.py
index dcada5b..12967fa 100644
--- a/erpnext/templates/pages/product_search.py
+++ b/erpnext/templates/pages/product_search.py
@@ -10,6 +10,7 @@
# For SEARCH -------
from redisearch import AutoCompleter, Client, Query
from erpnext.e_commerce.website_item_indexing import (
+ is_search_module_loaded,
WEBSITE_ITEM_INDEX,
WEBSITE_ITEM_NAME_AUTOCOMPLETE,
WEBSITE_ITEM_CATEGORY_AUTOCOMPLETE,
@@ -25,8 +26,15 @@
@frappe.whitelist(allow_guest=True)
def get_product_list(search=None, start=0, limit=12):
- # limit = 12 because we show 12 items in the grid view
+ data = get_product_data(search, start, limit)
+ for item in data:
+ set_product_info_for_website(item)
+
+ return [get_item_for_list_in_html(r) for r in data]
+
+def get_product_data(search=None, start=0, limit=12):
+ # limit = 12 because we show 12 items in the grid view
# base query
query = """select I.name, I.item_name, I.item_code, I.route, I.image, I.website_image, I.thumbnail, I.item_group,
I.description, I.web_long_description as website_description, I.is_stock_item,
@@ -49,24 +57,25 @@
# order by
query += """ order by I.weightage desc, in_stock desc, I.modified desc limit %s, %s""" % (cint(start), cint(limit))
- data = frappe.db.sql(query, {
+ return frappe.db.sql(query, {
"search": search,
"today": nowdate()
}, as_dict=1)
- for item in data:
- set_product_info_for_website(item)
-
- return [get_item_for_list_in_html(r) for r in data]
-
@frappe.whitelist(allow_guest=True)
def search(query, limit=10, fuzzy_search=True):
+ search_results = {"from_redisearch": True, "results": []}
+
+ if not is_search_module_loaded():
+ # Redisearch module not loaded
+ search_results["from_redisearch"] = False
+ search_results["results"] = get_product_data(query, 0, limit)
+ return search_results
+
if not query:
- # TODO: return top searches
- return []
+ return search_results
red = frappe.cache()
-
query = clean_up_query(query)
ac = AutoCompleter(make_key(WEBSITE_ITEM_NAME_AUTOCOMPLETE), conn=red)
@@ -88,12 +97,12 @@
print(f"Executing query: {q.query_string()}")
results = client.search(q)
- results = list(map(convert_to_dict, results.docs))
+ search_results['results'] = list(map(convert_to_dict, results.docs))
# FOR DEBUGGING
- print("SEARCH RESULTS ------------------\n ", results)
+ print("SEARCH RESULTS ------------------\n ", search_results)
- return results
+ return search_results
def clean_up_query(query):
return ''.join(c for c in query if c.isalnum() or c.isspace())
@@ -103,11 +112,19 @@
@frappe.whitelist(allow_guest=True)
def get_category_suggestions(query):
+ search_results = {"from_redisearch": True, "results": []}
+
+ if not is_search_module_loaded():
+ # Redisearch module not loaded
+ search_results["from_redisearch"] = False
+ return search_results
+
if not query:
- # TODO: return top searches
- return []
+ return search_results
ac = AutoCompleter(make_key(WEBSITE_ITEM_CATEGORY_AUTOCOMPLETE), conn=frappe.cache())
suggestions = ac.get_suggestions(query, num=10)
- return [s.string for s in suggestions]
\ No newline at end of file
+ search_results['results'] = [s.string for s in suggestions]
+
+ return search_results
\ No newline at end of file
diff --git a/erpnext/www/all-products/search.js b/erpnext/www/all-products/search.js
index cb3f9af..e88b576 100644
--- a/erpnext/www/all-products/search.js
+++ b/erpnext/www/all-products/search.js
@@ -45,8 +45,18 @@
}
function populateResults(data) {
+ if (!data.message.from_redisearch) {
+ // Data not from redisearch
+ }
+
+ if (data.message.results.length === 0) {
+ results.innerHTML = 'No results';
+ return;
+ }
+
html = ""
- for (let res of data.message) {
+ search_results = data.message.results
+ for (let res of search_results) {
html += `<li class="list-group-item list-group-item-action">
<img class="item-thumb" src="${res.thumbnail || 'img/placeholder.png'}" />
<a href="/${res.route}">${res.web_item_name} <span class="brand-line">${showBrandLine && res.brand ? "by " + res.brand : ""}</span></a>
@@ -56,13 +66,20 @@
}
function populateCategoriesList(data) {
- if (data.length === 0) {
- categoryList.innerHTML = 'Type something...';
+ if (!data.message.from_redisearch) {
+ // Data not from redisearch
+ categoryList.innerHTML = "Install Redisearch to enable autocompletions.";
+ return;
+ }
+
+ if (data.message.results.length === 0) {
+ categoryList.innerHTML = 'No results';
return;
}
html = ""
- for (let category of data.message) {
+ search_results = data.message.results
+ for (let category of search_results) {
html += `<li>${category}</li>`
}