Compare commits

..

No commits in common. "master" and "mt-additional-xml-shema-support" have entirely different histories.

5 changed files with 49 additions and 121 deletions

View File

@ -57,12 +57,17 @@ def export_entry(entry):
lexunit.appendChild(lexeme)
head.appendChild(lexunit)
# Example of keeping original xml and adding changes to it only
grammar_category = entry.original_xml.querySelector("head grammar category")
if grammar_category is None:
grammar = doc.createElement("grammar")
grammar_category = doc.createElement("category")
grammar_category.textContent = entry.grammar
grammar.appendChild(grammar_category)
head.appendChild(grammar)
entry.original_xml.querySelector("head").appendChild(grammar_category)
grammar_category.textContent = entry.grammar
head.appendChild(entry.original_xml.querySelector("head grammar"))
if len(entry.measure) > 0:

View File

@ -24,33 +24,32 @@ def build_structure_conversions():
if line[1] == "struktura":
continue
vto_structure = line[1].strip().split(">")[1].split("<")[0]
vto_name = line[2].strip()
vto_id = line[6].strip()
vto_id = line[4].strip()
if 0 in (len(vto_name), len(vto_id)):
continue
vfrom = "^" + line[0].replace("?", "\?").replace("%s", "([a-zA-Z螚ȎŠ-]+)") + "$"
structure_conversions.append((__new__(RegExp(vfrom, 'u')), vto_name, vto_structure, vto_id))
structure_conversions.append((__new__(RegExp(vfrom, 'u')), vto_name, vto_id))
def convert_structure(structure, type):
if structure_conversions is None:
build_structure_conversions()
for vfrom, vto_name, vto_structure, vto_id in structure_conversions:
for vfrom, vto_name, vto_id in structure_conversions:
match = structure.match(vfrom)
# fix for ids 106, 107, 44 which instead matched with 30
if match and vto_id == '30' and '-s' in type:
# fix for ids 65, 66, 67 which instead matched with 64
if match and vto_id == '64' and '-s' in type:
vto_name = 's0-vp-s0'
vto_id = '106'
elif match and vto_id == '30' and '-g' in type:
vto_id = '65'
elif match and vto_id == '64' and '-g' in type:
vto_name = 'gg-vp-gg'
vto_id = '107'
elif match and vto_id == '30' and '-r' in type:
vto_id = '66'
elif match and vto_id == '64' and '-r' in type:
vto_name = 'r-vp-r'
vto_id = '44'
vto_id = '67'
if match:
# we need to remove replace alias here as we want to use javascript's one
@ -58,7 +57,7 @@ def convert_structure(structure, type):
result = structure.replace(vfrom, vto_name).strip()
__pragma__('alias', 'replace', "py_replace")
return result, vto_structure, vto_id
return result, vto_id
window.console.log("Unknown structure: ", structure)
return 'N/A', '/'

View File

@ -59,8 +59,7 @@ class SkeCollocation:
def __init__(self, data):
self.word = data.word
self.frequency = data.count
self.gramrel = data.gramrel
self.structure_name, self.structure, self.structure_id = convert_structure(data.gramrel, data.lempos)
self.structure_name, self.structure_id = convert_structure(data.gramrel, data.lempos)
self.other = {"score": data.score, "cm": data.cm}
@ -103,28 +102,13 @@ def match_gf2_examples(data, *args):
xhr.send(to_send)
def make_cql_query(ske_index, search_term, pos):
cql_pos= {
"samostalnik": ("S.*", "-s"),
"glagol": ("G.*", "-g"),
"pridevnik": ("P.*", "-p"),
"prislov": ("R.*", "-r"),
"zaimek": ("Z.*", "-z")
}
if ske_index == 0:
return "[ lemma=\"{0}\" & tag=\"{1}\" ]".format(search_term, cql_pos[pos][0])
else:
return search_term + cql_pos[pos][1]
class SkeModal(ClickMessage):
def on_event(self, event):
# event could be data if this is the return from external library
if type(event) in [list, int]:
self.add_arg(event)
else:
if len(self._args) < 5:
if len(self._args) < 4:
self.add_arg(None)
super().on_event(event)
@ -132,20 +116,18 @@ class SkeModal(ClickMessage):
page_num = self.get_arg(0, int)
search_term = self.get_arg(1, str)
ske_index = self.get_arg(2, int)
ske_pos_query = self.get_arg(3, str)
ske_lookup = model.ske.url_for_kind_index(ske_index)
next_message = msg(SkeModal, page_num, search_term, ske_index, ske_pos_query)
next_message = msg(SkeModal, page_num, search_term, ske_index)
# could be none if empty
data = self.get_arg(4)
data = self.get_arg(3)
if data is None:
params = {"additional_refs": "s.id,p.id",
"page_num": page_num,
"error_callback": next_message,
"data_parser": get_parser(ske_index),
"querytype": ske_pos_query}
"data_parser": get_parser(ske_index)}
gdex = get_preference("ske_gdex")
if gdex:
@ -154,36 +136,15 @@ class SkeModal(ClickMessage):
return
params["gdex"] = gdex
# enable CQL query
if ske_pos_query is not "simple":
search_term_old = search_term
search_term = make_cql_query(ske_index, search_term, ske_pos_query)
model.ske.request(search_term, next_message, ske_lookup, params)
search_term = search_term_old
elif type(data) is list:
window.console.log(data)
# check if gf2 examples are loaded or not
if not data[0].gf2_check and type(data[0]) is SkeExample:
# we get the data, we have to match it with available data on our gf2 examples API
match_gf2_examples(data, page_num, search_term, ske_index, ske_pos_query)
elif type(data[0]) is SkeCollocation:
# filtering, grouping and sorting data
data.sort(key= lambda x: float(x.other["score"]), reverse=True)
_data = []
while len(data) > 0:
max_item = data.pop(0) # max(data, key= lambda x: x.other["score"])
_data.append(max_item)
for item in data:
if "N/A" in item.structure_name:
data.remove(item)
elif item.structure_name.strip() == max_item.structure_name.strip():
_data.append(item)
for delete_item in _data:
if delete_item in data:
data.remove(delete_item)
data = _data
match_gf2_examples(data, page_num, search_term, ske_index)
model.modal_set(lambda: modals.ske_list(
search_term, data, page_num, model.entry.senses, model.ske.request_kinds))
@ -194,7 +155,7 @@ class SkeModal(ClickMessage):
class SkeModalGf2Update(SkeModal):
def on_event(self, event):
response_data = window.JSON.parse(event.target.response)
data = self.get_arg(4)
data = self.get_arg(3)
data_dict = {}
for example in data:
@ -230,7 +191,6 @@ class SearchInSkeModal(SkeModal):
self.add_arg(int(document.getElementById("ske-page-num").value))
self.add_arg(document.getElementById("ske-search").value)
self.add_arg(document.getElementById("ske-select").selectedIndex)
self.add_arg(document.getElementById("ske-pos-query").value)
super().on_event(event)
@ -278,7 +238,7 @@ class SkeInsert(DataChgClickMessage):
lex_mid = ComponentLexeme()
lex_mid.text = example["mid"]
lex_mid.role = "headword"
lex_mid.role = "collocation"
lex_right = ComponentLexeme()
lex_right.text = example["right"]
@ -297,45 +257,17 @@ class SkeInsert(DataChgClickMessage):
new_collocation.inner.other_attributes["frequency"] = example.frequency
new_collocation.inner.type = "collocation"
headword = document.getElementById("ske-search").value
lexemes = []
structure_name = example.structure_name.split("-")
gramrel = example.gramrel.split("_")
structure = example.structure.split(" ")
structure.append("") # Bad fix: we have to add something for structure l-gg-ggn
lex_left = ComponentLexeme()
lex_left.text = ""
lex_left.role = None
for i in range(len(structure_name)):
lex = ComponentLexeme()
structure[i] = structure[i].replace("Inf-", "")
lex_mid = ComponentLexeme()
lex_mid.text = example.word
lex_mid.role = "collocation"
# take care of negations "ne"
if "Neg-" in structure[i]:
structure[i] = structure[i].replace("Neg-", "")
negation_flag = True
n_lex = ComponentLexeme()
n_lex.text = "ne"
n_lex.role = "other"
lexemes.append(n_lex)
lex_right = ComponentLexeme()
lex_right.text = ""
lex_right.role = None
if structure[i] is "":
continue # skipping bcs of fix
elif "Vez-gbz" in structure[i]:
lex.text = "je"
lex.role = "other"
elif structure_name[i] in ["d", "vd", "zp"]:
lex.text = gramrel[i]
lex.text = lex.text.replace("-d", "").replace("%", "")
lex.role = "other"
elif structure_name[i] is "vp":
lex.text = structure[i]
lex.role = "other"
elif structure[i][0] in ["S", "G", "P", "R"]:
lex.text = headword
lex.role = "headword"
else:
lex.text = example.word
lex.role = "collocate"
lexemes.append(lex)
new_collocation.components.extend(lexemes)
new_collocation.components.extend([lex_left, lex_mid, lex_right])
return new_collocation

View File

@ -64,7 +64,6 @@ def edit_example(example, sense):
result.append(h("span.example-component-button.example-component-none",
{"on": {"click": role_msg(idx, "none")}}, "N"))
if "-" not in example.inner.other_attributes["structureName"]:
result.extend([
h("span.example-component-button",
{"on": {"click": message.msg(message.ExampleComponentAdd, example_original, idx)}}, "+"),
@ -73,9 +72,6 @@ def edit_example(example, sense):
return result
divs.append(h("div.flex.five.example-component", {}, [h("div.one-fifth", {}, "Struktura:"),
h("div.three-fifth", {}, example.inner.other_attributes["structureName"])]))
for idx, component in enumerate(example.components):
role_txt = component.role if component.role is not None else "none"
color_class = ".example-component-" + role_txt
@ -181,10 +177,6 @@ def ske_list(search_term, data, page_num, senses, ske_kinds):
"type": "number",
"min": 1,
"step": 1}}, "")]),
h("label.fourth.ske-mid-input", {}, [
h("select#ske-pos-query", {}, [h("option", {}, "{}".format(pos)) for pos in ["simple", "samostalnik", "glagol", "pridevnik", "prislov", "zaimek"]])
]),
h("span.fourth.button.ske-right-button",
{"on": {"click": message.msg(message.SearchInSkeModal)}}, "Isci")]),
h("div.ske-list",

View File

@ -58,7 +58,7 @@ class View:
def view_ske_button(model):
return h(
"span#ske-button.button.toggle",
{ "on": {"click": msg(ShowSkeModal, 1, model.entry.headword, 0, "simple")} },
{ "on": {"click": msg(ShowSkeModal, 1, model.entry.headword, 0)} },
h("svg#ske-img", {
"attrs": {
"xmlns": "http://www.w3.org/2000/svg",