From bfa1f6978bb944256fc57c63cdead9364b4fc247 Mon Sep 17 00:00:00 2001 From: Will Date: Tue, 9 Jan 2024 12:03:39 -0800 Subject: [PATCH] Text search mods -Don't fill in last term in search box to prevent value incorrectly re-populating on [enter] - Changed text and code search to use wildcards (*s) --- cmd/dashboard/dashboard/pages/5_Document Search.py | 11 ++--------- cmd/dashboard/dashboard/utils.py | 10 ++++++++-- 2 files changed, 10 insertions(+), 11 deletions(-) diff --git a/cmd/dashboard/dashboard/pages/5_Document Search.py b/cmd/dashboard/dashboard/pages/5_Document Search.py index 9c4afb0..cd552f0 100644 --- a/cmd/dashboard/dashboard/pages/5_Document Search.py +++ b/cmd/dashboard/dashboard/pages/5_Document Search.py @@ -55,10 +55,7 @@ def build_page(username: str): ) if chosen_tab == "text_search": - if st.session_state.text_search is None: - search_term = st.text_input("Enter search term(s):") - else: - search_term = st.text_input("Enter search term(s):", st.session_state.text_search) + search_term = st.text_input("Enter search term(s):") if not search_term: return @@ -121,11 +118,7 @@ def build_page(username: str): st.write(pagination_html, unsafe_allow_html=True) elif chosen_tab == "source_code_search": - if st.session_state.text_search is None: - search_term = st.text_input("Enter search term(s):") - else: - search_term = st.text_input("Enter search term(s):", st.session_state.text_search) - + search_term = st.text_input("Enter search term(s):") if search_term != "": st.session_state.text_search = search_term from_i = (st.session_state.text_page - 1) * PAGE_SIZE diff --git a/cmd/dashboard/dashboard/utils.py b/cmd/dashboard/dashboard/utils.py index 36fb151..c22a869 100644 --- a/cmd/dashboard/dashboard/utils.py +++ b/cmd/dashboard/dashboard/utils.py @@ -837,7 +837,10 @@ def elastic_text_search(search_term: str, from_i: int, size: int) -> dict: """ try: es_client = wait_for_elasticsearch() - query = {"match": {"text": search_term}} + query = { + # "match": {"text": search_term} + "wildcard": {"text": {"value": search_term}} + } highlight = {"pre_tags": [""], "post_tags": [""], "fields": {"text": {}}} fields = [ "_id", @@ -866,7 +869,10 @@ def elastic_sourcecode_search(search_term: str, from_i: int, size: int) -> dict: """ try: es_client = wait_for_elasticsearch() - query = {"match": {"text": search_term}} + query = { + #"match": {"text": search_term} + "wildcard": {"text": {"value": search_term}} + } highlight = {"pre_tags": [""], "post_tags": [""], "fields": {"text": {}}} fields = [ "_id",