diff --git a/aore/search/search.py b/aore/search/search.py index f54535b..d734e64 100644 --- a/aore/search/search.py +++ b/aore/search/search.py @@ -102,6 +102,12 @@ class SphinxSearch: return we_list + # Осуществляет поиск строки, на выходе массив таких параметров: + # aoid - AOID + # text - текст найденного адресного объекта + # ratio - рейтинг найденного пункта + # cort - рейтинг количества совпавших слов + def find(self, text, strong): def split_phrase(phrase): phrase = unicode(phrase).lower() @@ -120,7 +126,7 @@ class SphinxSearch: # получаем все вариации слов all_variations = [] for we in word_entries: - for vari in we.variations_gen(strong, self.__get_suggest): + for vari in we.variations_generator(strong, self.__get_suggest): all_variations.append(vari) good_vars = [v for v in all_variations if v.var_type == VariationType.normal] diff --git a/aore/search/wordentry.py b/aore/search/wordentry.py index b4001f8..300008b 100644 --- a/aore/search/wordentry.py +++ b/aore/search/wordentry.py @@ -75,7 +75,7 @@ class WordEntry: def __cleanify(self, word): return word.replace('-', '').replace('@', '') - def variations_gen(self, strong, suggestion_func): + def variations_generator(self, strong, suggestion_func): default_var_type = VariationType.normal # Если слово встречается часто, ставим у всех вариантов тип VariationType.freq if self.parameters['IS_FREQ']: diff --git a/passenger_wsgi.py b/passenger_wsgi.py index 4570273..2ddf04b 100644 --- a/passenger_wsgi.py +++ b/passenger_wsgi.py @@ -15,4 +15,4 @@ application = phias_app.get_app() # Run bottle WSGI server if no external if __name__ == '__main__': - application.start(host='0.0.0.0', port=8087, debug=True) + phias_app.start(host='0.0.0.0', port=8087, debug=True)