stale/py-phias
1
0
Fork 0
Code Issues 1 Pull Requests Actions Packages Projects Releases Wiki Activity

Small refactoring (static method and comments)

Browse Source
This commit is contained in:
jar3b 2016-03-14 17:39:43 +03:00
parent 5e310df926
commit 8d0a54618e
2 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
aore/search/fiasfactory.py
View File

@ -21,7 +21,8 @@ class FiasFactory:
self.normalize_templ = template('aore/templates/postgre/normalize_query.sql', aoid="//aoid") self.normalize_templ = template('aore/templates/postgre/normalize_query.sql', aoid="//aoid")
# Проверка, что строка является действительым UUID v4 # Проверка, что строка является действительым UUID v4
def __check_uuid(self, guid): @staticmethod
def __check_uuid(guid):
try: try:
UUID(guid) UUID(guid)
except ValueError: except ValueError:

10
aore/search/search.py
View File

@ -30,15 +30,19 @@ class SphinxSearch:
sphinx_host = sphinx_conf.listen sphinx_host = sphinx_conf.listen
sphinx_port = None sphinx_port = None
# Получаем строку подключения для Sphinx
if ":" in sphinx_conf.listen and "unix:/" not in sphinx_conf.listen: if ":" in sphinx_conf.listen and "unix:/" not in sphinx_conf.listen:
sphinx_host, sphinx_port = sphinx_conf.listen.split(":") sphinx_host, sphinx_port = sphinx_conf.listen.split(":")
sphinx_port = int(sphinx_port) sphinx_port = int(sphinx_port)
# Настраиваем подключение для подсказок
self.client_sugg = sphinxapi.SphinxClient() self.client_sugg = sphinxapi.SphinxClient()
self.client_sugg.SetServer(sphinx_host, sphinx_port) self.client_sugg.SetServer(sphinx_host, sphinx_port)
self.client_sugg.SetLimits(0, self.max_result) self.client_sugg.SetLimits(0, self.max_result)
self.client_sugg.SetConnectTimeout(3.0) self.client_sugg.SetConnectTimeout(3.0)
# Настраиваем подключение для поиска адреса
self.client_show = sphinxapi.SphinxClient() self.client_show = sphinxapi.SphinxClient()
self.client_show.SetServer(sphinx_host, sphinx_port) self.client_show.SetServer(sphinx_host, sphinx_port)
self.client_show.SetLimits(0, self.max_result) self.client_show.SetLimits(0, self.max_result)
@ -141,12 +145,12 @@ class SphinxSearch:
rs = self.client_show.RunQueries() rs = self.client_show.RunQueries()
elapsed_t = time.time() - start_t elapsed_t = time.time() - start_t
if basic.logging:
logging.info("Sphinx time for {} = {}".format(text, elapsed_t))
if rs is None: if rs is None:
raise FiasException("Cannot find sentence.") raise FiasException("Cannot find sentence.")
if basic.logging:
logging.info("Sphinx time for {} = {}".format(text, elapsed_t))
results = [] results = []
parsed_ids = [] parsed_ids = []