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

Big commit for py3

Browse Source
This commit is contained in:
jar3b
2016-04-22 14:30:05 +03:00
parent 9ed372857e
commit c7f0de74a5
15 changed files with 103 additions and 63 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
aore/miscutils/fysearch.py
View File

@@ -13,7 +13,7 @@ def violet_ratio(pattern, candidate):
for i in range(len(arr_pattern) - 1, -1, -1):
max_j = -1
max_ratio = -1
allowed_nums = range(len(arr_candidate) - 1, -1, -1)
allowed_nums = list(range(len(arr_candidate) - 1, -1, -1))
for j in allowed_nums:
ratio = Levenshtein.ratio(arr_pattern[i], arr_candidate[j])
@@ -24,7 +24,7 @@ def violet_ratio(pattern, candidate):
result.append(max_j*abs(max_ratio))
if max_j > -1:
allowed_nums.remove(max_j)
del allowed_nums[max_j]
del arr_candidate[max_j]
return sum(result) - len(arr_candidate)

18
aore/miscutils/sphinx.py
View File

@@ -22,11 +22,11 @@ class SphinxHelper:
os.makedirs(Folders.temp)
# оздаем 3 папки для Сфинкса
if not os.path.exists(SphinxConfig.var_dir+ '/run'):
if not os.path.exists(SphinxConfig.var_dir + '/run'):
os.makedirs(SphinxConfig.var_dir + '/run')
if not os.path.exists(SphinxConfig.var_dir+ '/log'):
if not os.path.exists(SphinxConfig.var_dir + '/log'):
os.makedirs(SphinxConfig.var_dir + '/log')
if not os.path.exists(SphinxConfig.var_dir+ '/data'):
if not os.path.exists(SphinxConfig.var_dir + '/data'):
os.makedirs(SphinxConfig.var_dir + '/data')
def configure_indexer(self, indexer_binary, config_filename):
@@ -55,7 +55,7 @@ class SphinxHelper:
logging.info("All indexes were created.")
# remove temp files
for fname, fpath in self.files.iteritems():
for fname, fpath in self.files.items():
try:
os.remove(fpath)
except:
@@ -84,10 +84,10 @@ class SphinxHelper:
def __dbexport_sugg_dict(self):
logging.info("Place suggestion dict to DB %s...", self.files['dict.txt'])
dict_dat_fname = os.path.abspath(Folders.temp + "/suggdict.csv")
fname = os.path.abspath(Folders.temp + "/suggdict.csv")
csv_counter = 0
with open(self.files['dict.txt'], "r") as dict_file, open(dict_dat_fname, "w") as exit_file:
with open(self.files['dict.txt'], "r") as dict_file, open(fname, "w") as exit_file:
line = None
while line != '':
nodes = []
@@ -111,9 +111,11 @@ class SphinxHelper:
except:
pass
self.aodp.bulk_csv(AoXmlTableEntry.OperationType.update, "AOTRIG", csv_counter, dict_dat_fname)
self.aodp.bulk_csv(AoXmlTableEntry.OperationType.update, "AOTRIG", csv_counter, fname)
logging.info("Done.")
return fname
def __create_ao_index_config(self):
fname = os.path.abspath(Folders.temp + "/addrobj.conf")
logging.info("Creating config %s", fname)
@@ -156,7 +158,7 @@ class SphinxHelper:
sphinx_var_path=SphinxConfig.var_dir)
f = open(out_filename, "w")
for fname, fpath in self.files.iteritems():
for fname, fpath in self.files.items():
if ".conf" in fname:
with open(fpath, "r") as conff:
for line in conff: