sporada/nopaque
1
0
Fork 0
mirror of https://gitlab.ub.uni-bielefeld.de/sfb1288inf/nopaque.git synced 2025-11-04 04:12:45 +00:00
Code Issues Projects Releases Wiki Activity

Merge branch 'development' of gitlab.ub.uni-bielefeld.de:sfb1288inf/opaque into development

Browse Source
This commit is contained in:
Patrick Jentsch
2019-11-26 14:58:48 +01:00
parent 58b42822dc 30f60b60c2
commit 9f42b9b99d
2 changed files with 18 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/corpora/CQiWrapper/CQiClient.py
View File

@@ -553,13 +553,13 @@ class CQiClient:
return data return data
def __recv_DATA_INT_INT(self): def __recv_DATA_INT_INT(self):
return (self.__recv_INT(), self.__recv_INT()) return (self.__recv_DATA_INT(), self.__recv_DATA_INT())
def __recv_DATA_INT_INT_INT_INT(self): def __recv_DATA_INT_INT_INT_INT(self):
return (self.__recv_INT(), return (self.__recv_DATA_INT(),
self.__recv_INT(), self.__recv_DATA_INT(),
self.__recv_INT(), self.__recv_DATA_INT(),
self.__recv_INT()) self.__recv_DATA_INT())
def __recv_DATA_INT_TABLE(self): def __recv_DATA_INT_TABLE(self):
rows = self.__recv_DATA_INT() rows = self.__recv_DATA_INT()

15
app/corpora/CQiWrapper/CQiWrapper.py
View File

@@ -1,6 +1,7 @@
from .CQiClient import CQiClient from .CQiClient import CQiClient
from .CQi import CONST_FIELD_MATCH, CONST_FIELD_MATCHEND from .CQi import CONST_FIELD_MATCH, CONST_FIELD_MATCHEND
import collections import collections
import re
from app import logger # only works if imported into opaque web app from app import logger # only works if imported into opaque web app
@@ -173,7 +174,7 @@ class CQiWrapper(CQiClient):
# Get cpos informations like CORPUS_NAME.word or CORPUS_NAME.lemma for # Get cpos informations like CORPUS_NAME.word or CORPUS_NAME.lemma for
# all cpos entries in all_cpos_list # all cpos entries in all_cpos_list
# Also saves these informations into the ordered_matches dict # Also saves these informations into the ordered_matches dict
all_cpos_infos = self.get_cpos_infos(all_cpos_list) all_cpos_infos, s_list = self.get_cpos_infos(all_cpos_list)
for key in ordered_matches.keys(): for key in ordered_matches.keys():
# loops over cpos in cpos_list which holds all match cpos # loops over cpos in cpos_list which holds all match cpos
# Replaces one cpos with the corresponding cpos information created # Replaces one cpos with the corresponding cpos information created
@@ -212,6 +213,13 @@ class CQiWrapper(CQiClient):
except UnboundLocalError: except UnboundLocalError:
logger.warning('Context after cpos list is empty.') logger.warning('Context after cpos list is empty.')
pass pass
sentences = {}
s_list = set(s_list)
for s_id in s_list:
s_start, s_end = self.cl_struc2cpos('CORPUS.s', s_id)
sentence = self.cl_cpos2str('CORPUS.word', range(s_start, s_end + 1))
sentences.update({s_id: re.sub(r' (?=\W)', '', ' '.join(sentence))})
ordered_matches['sentences'] = sentences
return ordered_matches return ordered_matches
def get_cpos_infos(self, all_cpos): def get_cpos_infos(self, all_cpos):
@@ -220,6 +228,7 @@ class CQiWrapper(CQiClient):
all cpos entries specified in the parameter all_cpos. all cpos entries specified in the parameter all_cpos.
''' '''
cpos_infos = {} cpos_infos = {}
s_list = []
for key in self.attr_strings.keys(): for key in self.attr_strings.keys():
if key == 'positional_attrs': if key == 'positional_attrs':
for p_attr_key in self.attr_strings[key].keys(): for p_attr_key in self.attr_strings[key].keys():
@@ -233,6 +242,8 @@ class CQiWrapper(CQiClient):
has_value = self.corpus_structural_attribute_has_values(self.attr_strings[key][struct_attr_key]) has_value = self.corpus_structural_attribute_has_values(self.attr_strings[key][struct_attr_key])
if has_value: if has_value:
match_strs = self.cl_struc2str(self.attr_strings[key][struct_attr_key], struct_entry) match_strs = self.cl_struc2str(self.attr_strings[key][struct_attr_key], struct_entry)
elif self.attr_strings[key][struct_attr_key] == 'CORPUS.s':
s_list.extend(struct_entry)
else: else:
match_strs = [None for i in struct_entry] match_strs = [None for i in struct_entry]
cpos_infos[struct_attr_key] = zip(struct_entry, match_strs) cpos_infos[struct_attr_key] = zip(struct_entry, match_strs)
@@ -245,4 +256,4 @@ class CQiWrapper(CQiClient):
dict_cpos_infos = {} dict_cpos_infos = {}
for info in joined_cpos_infos: for info in joined_cpos_infos:
dict_cpos_infos[info[0]] = dict(zip(attr_key_list, info[1:])) dict_cpos_infos[info[0]] = dict(zip(attr_key_list, info[1:]))
return dict_cpos_infos return dict_cpos_infos, s_list