Fixe some things for query results

This commit is contained in:
Stephan Porada
2019-11-28 15:19:52 +01:00
parent dbd580b3c0
commit 1c9e715980
3 changed files with 17 additions and 10 deletions

View File

@ -133,8 +133,8 @@ class CQiWrapper(CQiClient):
# match_boundries shows the start and end cpos of one match as a
# pair of cpositions
# [(1355, 1357), (1477, 1479)] Example for two boundry pairs
offset_start = 0 + (result_offset + 1) if result_offset != 0 else result_offset
offset_end = self.nr_matches + result_offset
offset_start = 0 if result_offset == 0 else result_offset
offset_end = self.nr_matches + result_offset - 1
match_boundaries = zip(self.cqp_dump_subcorpus(self.result_subcorpus,
CONST_FIELD_MATCH,
offset_start,
@ -152,9 +152,10 @@ class CQiWrapper(CQiClient):
all_matches = []
all_cpos = []
for start, end in match_boundaries:
end += 1
lc_cpos = list(range(max([0, start - self.context_len]), start))
lc = {'lc': lc_cpos}
match_cpos = list(range(start, end + 1))
match_cpos = list(range(start, end))
match = {'hit': match_cpos}
rc_cpos = list(range(end, min([self.corpus_max_len, end + self.context_len])))
rc = {'rc': rc_cpos}
@ -226,7 +227,7 @@ class CQiWrapper(CQiClient):
text_lookup = {}
for d in structs_to_check:
s_key, s_value = zip(*d.items())
s_value = s_value[0].split('_')[1]
s_value = s_value[0].split('_', 1)[1]
struct_values = self.cl_struc2str(s_key[0], text_lookup_ids)
zipped = dict(zip(text_lookup_ids, struct_values))
for zip_key, zip_value in zipped.items():