diff --git a/searx/webapp.py b/searx/webapp.py index 2108403ee..e1d591b8c 100755 --- a/searx/webapp.py +++ b/searx/webapp.py @@ -700,12 +700,10 @@ def search(): net_search = True net_search_str = 'true' prompt = "" - try: search_query, raw_text_query, _, _ = get_search_query_from_webapp(request.preferences, request.form) # search = Search(search_query) # without plugins if request.environ['HTTP_CF_IPCOUNTRY'] == 'CN' and gfw.exists(search_query.query): return render('404.html'), 404 - try: original_search_query = search_query.query if "模仿" in search_query.query or "扮演" in search_query.query or "你能" in search_query.query or "请推荐" in search_query.query or "帮我" in search_query.query or "写一段" in search_query.query or "写一个" in search_query.query or "请问" in search_query.query or "请给" in search_query.query or "请你" in search_query.query or "请推荐" in search_query.query or "是谁" in search_query.query or "能帮忙" in search_query.query or "介绍一下" in search_query.query or "为什么" in search_query.query or "什么是" in search_query.query or "有什么" in search_query.query or "怎样" in search_query.query or "给我" in search_query.query or "如何" in search_query.query or "谁是" in search_query.query or "查询" in search_query.query or "告诉我" in search_query.query or "查一下" in search_query.query or "找一个" in search_query.query or "什么样" in search_query.query or "哪个" in search_query.query or "哪些" in search_query.query or "哪一个" in search_query.query or "哪一些" in search_query.query or "啥是" in search_query.query or "为啥" in search_query.query or "怎么" in search_query.query: if len(search_query.query)>5 and "谁是" in search_query.query: @@ -772,18 +770,11 @@ def search(): search_type = gpt_judge[0] net_search = False net_search_str = 'false' - except Exception as ee: - logger.exception(ee, exc_info=True) + search = SearchWithPlugins(search_query, request.user_plugins, request) # pylint: disable=redefined-outer-name result_container = search.search() - except SearxParameterException as e: - logger.exception('search error: SearxParameterException') - return index_error(output_format, e.message), 400 - except Exception as e: # pylint: disable=broad-except - logger.exception(e, exc_info=True) - return index_error(output_format, gettext('No item found')), 500 # results results = result_container.get_ordered_results() @@ -2035,6 +2026,7 @@ for(let i=prompt.url_pair.length;i>=0;--i) new_text = new_text.replaceAll('[]', ''); new_text = new_text.replaceAll('((', '('); new_text = new_text.replaceAll('))', ')'); + new_text = new_text.replaceAll('(\n', '\n'); return new_text; } diff --git a/searx/webapp1.py b/searx/webapp1.py index 2108403ee..19f271a2b 100644 --- a/searx/webapp1.py +++ b/searx/webapp1.py @@ -2035,6 +2035,7 @@ for(let i=prompt.url_pair.length;i>=0;--i) new_text = new_text.replaceAll('[]', ''); new_text = new_text.replaceAll('((', '('); new_text = new_text.replaceAll('))', ')'); + new_text = new_text.replaceAll('(\n', '\n'); return new_text; }