Попытка сделать нормальный поиск

This commit is contained in:
Jack Stdin
2016-01-14 16:51:34 +03:00
parent 759efc43ee
commit 8156fa3d8d
7 changed files with 94 additions and 20 deletions

View File

@@ -5,18 +5,59 @@ import os
from bottle import template
from aore.config import db as dbconfig, sphinx_index_name, sphinx_var_dir
from aore.config import db as dbconfig, sphinx_index_addjobj, sphinx_var_dir, trashfolder
def produce_sphinx_config(config_name):
logging.info("Creating {}".format(config_name))
conf_data = template('aore/templates/sphinx/data.conf', db_host=dbconfig['host'], db_user=dbconfig['user'],
def configure_sphinx(indexer_binary):
logging.info("Start configuring Sphinx...")
# Create ADDROBJ config
addrobj_cfg_name = get_addrobj_config()
# Indexing it...
run_index_cmd = "{} -c {} --all".format(indexer_binary, addrobj_cfg_name)
logging.info("Run indexer (indexing ADDROBJ)...")
os.system(run_index_cmd)
logging.info("{} index was created.".format(sphinx_index_addjobj))
# Produce dict file
sugg_dict_name = get_suggestion_dict(indexer_binary, addrobj_cfg_name)
def get_suggestion_dict(indexer_binary, addrobj_cfg_name):
logging.info("Make suggestion dict...")
dict_file_name = os.path.abspath(trashfolder + "suggdict.txt")
run_builddict_cmd = "{} {} -c {} --buildstops {} 200000 --buildfreqs".format(indexer_binary, sphinx_index_addjobj,
addrobj_cfg_name, dict_file_name)
os.system(run_builddict_cmd)
logging.info("Done.")
return dict_file_name
def get_addrobj_config():
config_fname = os.path.abspath(trashfolder + "addrobj.conf")
logging.info("Creating config {}".format(config_fname))
conf_data = template('aore/templates/sphinx/idx_addrobj.conf', db_host=dbconfig['host'], db_user=dbconfig['user'],
db_password=dbconfig['password'],
db_name=dbconfig['database'], db_port=dbconfig['port'],
sql_query=template('aore/templates/postgre/sphinx_query.sql').replace("\n"," \\\n"), index_name=sphinx_index_name,
sql_query=template('aore/templates/postgre/sphinx_query.sql').replace("\n", " \\\n"),
index_name=sphinx_index_addjobj,
sphinx_var_path=sphinx_var_dir)
conf_data += "\n" + template('aore/templates/sphinx/sphinx.conf', sphinx_var_path=sphinx_var_dir)
f = open(config_fname, "w")
f.write(conf_data)
f.close()
logging.info("Done.")
return config_fname
# TRASH
def produce_sphinx_config(config_name):
conf_data = template('aore/templates/sphinx/sphinx.conf', sphinx_var_path=sphinx_var_dir)
if os.path.isfile(config_name):
choice = raw_input(