git.iko.soy/searx
on master help sign in
[mod] searx.query.RawTextQuery: getSearchQuery and changeSearchQuery rename to getQuery and changeQuery
edd8dccAlexandre Flament
searx/autocomplete.py+6−6
compare with master
unifiedsplit
@@ -38,22 +38,22 @@ def get(*args, **kwargs):
38def searx_bang(full_query):
38def searx_bang(full_query):
39 '''check if the searchQuery contain a bang, and create fitting autocompleter results'''
39 '''check if the searchQuery contain a bang, and create fitting autocompleter results'''
40 # check if there is a query which can be parsed
40 # check if there is a query which can be parsed
41− if len(full_query.getSearchQuery()) == 0:
41+ if len(full_query.getQuery()) == 0:
42 return []
42 return []
43
43
44 results = []
44 results = []
45
45
46 # check if current query stats with !bang
46 # check if current query stats with !bang
47− first_char = full_query.getSearchQuery()[0]
47+ first_char = full_query.getQuery()[0]
48 if first_char == '!' or first_char == '?':
48 if first_char == '!' or first_char == '?':
49− if len(full_query.getSearchQuery()) == 1:
49+ if len(full_query.getQuery()) == 1:
50 # show some example queries
50 # show some example queries
51 # TODO, check if engine is not avaliable
51 # TODO, check if engine is not avaliable
52 results.append(first_char + "images")
52 results.append(first_char + "images")
53 results.append(first_char + "wikipedia")
53 results.append(first_char + "wikipedia")
54 results.append(first_char + "osm")
54 results.append(first_char + "osm")
55 else:
55 else:
56− engine_query = full_query.getSearchQuery()[1:]
56+ engine_query = full_query.getQuery()[1:]
57
57
58 # check if query starts with categorie name
58 # check if query starts with categorie name
59 for categorie in categories:
59 for categorie in categories:
@@ -72,14 +72,14 @@ def searx_bang(full_query):
72
72
73 # check if current query stats with :bang
73 # check if current query stats with :bang
74 elif first_char == ':':
74 elif first_char == ':':
75− if len(full_query.getSearchQuery()) == 1:
75+ if len(full_query.getQuery()) == 1:
76 # show some example queries
76 # show some example queries
77 results.append(":en")
77 results.append(":en")
78 results.append(":en_us")
78 results.append(":en_us")
79 results.append(":english")
79 results.append(":english")
80 results.append(":united_kingdom")
80 results.append(":united_kingdom")
81 else:
81 else:
82− engine_query = full_query.getSearchQuery()[1:]
82+ engine_query = full_query.getQuery()[1:]
83
83
84 for lc in language_codes:
84 for lc in language_codes:
85 lang_id, lang_name, country, english_name = map(str.lower, lc)
85 lang_id, lang_name, country, english_name = map(str.lower, lc)
searx/query.py+4−4
@@ -162,14 +162,14 @@ class RawTextQuery:
162 # append query part to query_part list
162 # append query part to query_part list
163 self.query_parts.append(query_part)
163 self.query_parts.append(query_part)
164
164
165− def changeSearchQuery(self, search_query):
165+ def changeQuery(self, query):
166 if len(self.query_parts):
166 if len(self.query_parts):
167− self.query_parts[-1] = search_query
167+ self.query_parts[-1] = query
168 else:
168 else:
169− self.query_parts.append(search_query)
169+ self.query_parts.append(query)
170 return self
170 return self
171
171
172− def getSearchQuery(self):
172+ def getQuery(self):
173 if len(self.query_parts):
173 if len(self.query_parts):
174 return self.query_parts[-1]
174 return self.query_parts[-1]
175 else:
175 else:
searx/search.py+1−1
@@ -268,7 +268,7 @@ def get_search_query_from_webapp(preferences, form):
268 raw_text_query = RawTextQuery(form['q'], disabled_engines)
268 raw_text_query = RawTextQuery(form['q'], disabled_engines)
269
269
270 # set query
270 # set query
271− query = raw_text_query.getSearchQuery()
271+ query = raw_text_query.getQuery()
272
272
273 # get and check page number
273 # get and check page number
274 pageno_param = form.get('pageno', '1')
274 pageno_param = form.get('pageno', '1')
searx/webapp.py+5−5
@@ -679,13 +679,13 @@ def index():
679
679
680 # suggestions: use RawTextQuery to get the suggestion URLs with the same bang
680 # suggestions: use RawTextQuery to get the suggestion URLs with the same bang
681 suggestion_urls = list(map(lambda suggestion: {
681 suggestion_urls = list(map(lambda suggestion: {
682− 'url': raw_text_query.changeSearchQuery(suggestion).getFullQuery(),
682+ 'url': raw_text_query.changeQuery(suggestion).getFullQuery(),
683 'title': suggestion
683 'title': suggestion
684 },
684 },
685 result_container.suggestions))
685 result_container.suggestions))
686
686
687 correction_urls = list(map(lambda correction: {
687 correction_urls = list(map(lambda correction: {
688− 'url': raw_text_query.changeSearchQuery(correction).getFullQuery(),
688+ 'url': raw_text_query.changeQuery(correction).getFullQuery(),
689 'title': correction
689 'title': correction
690 },
690 },
691 result_container.corrections))
691 result_container.corrections))
@@ -744,7 +744,7 @@ def autocompleter():
744 raw_text_query = RawTextQuery(request.form.get('q', ''), disabled_engines)
744 raw_text_query = RawTextQuery(request.form.get('q', ''), disabled_engines)
745
745
746 # check if search query is set
746 # check if search query is set
747− if not raw_text_query.getSearchQuery():
747+ if not raw_text_query.getQuery():
748 return '', 400
748 return '', 400
749
749
750 # run autocompleter
750 # run autocompleter
@@ -765,12 +765,12 @@ def autocompleter():
765 else:
765 else:
766 language = language.split('-')[0]
766 language = language.split('-')[0]
767 # run autocompletion
767 # run autocompletion
768− raw_results.extend(completer(raw_text_query.getSearchQuery(), language))
768+ raw_results.extend(completer(raw_text_query.getQuery(), language))
769
769
770 # parse results (write :language and !engine back to result string)
770 # parse results (write :language and !engine back to result string)
771 results = []
771 results = []
772 for result in raw_results:
772 for result in raw_results:
773− raw_text_query.changeSearchQuery(result)
773+ raw_text_query.changeQuery(result)
774
774
775 # add parsed result
775 # add parsed result
776 results.append(raw_text_query.getFullQuery())
776 results.append(raw_text_query.getFullQuery())