add support for lexeme_id on comp

Reviewed-on: #6

.gitignore

@@ -10,5 +10,5 @@ build/*
 # using kdev4, works fairly nicely!
 .kdev4
 **/*.kdev4
-
+remote
 

res/main.less

@@ -156,16 +156,7 @@
             vertical-align: super;
             font-size: 0.7em;
           }
-          .translation-explanation:not(:empty) {
-            font-style: italic;
 
-            &:before {
-              content: '[';
-            }
-            &:after {
-              content: ']';
-            }
-          }
         }
 
         .translation-add {
@@ -175,6 +166,20 @@
       }
     }
 
+    .explanations:not(:empty) {
+      font-style: italic;
+
+      &:not(.solo) {
+        &:before {
+          content: '[';
+        }
+
+        &:after {
+          content: ']';
+        }
+      }
+    }
+
     .example {
       clear: left;
       margin-left: 1em;

src/export.py

@@ -5,7 +5,7 @@ from model.tags import export_tag
 def export_to_xml(model):
     xml_document = export_entry(model.entry)
     serializer = __new__(XMLSerializer())
-    return serializer.serializeToString(xml_document);
+    return serializer.serializeToString(xml_document)
 
 
 def export_entry(entry):
@@ -23,9 +23,14 @@ def export_entry(entry):
 
     headword = doc.createElement("headword")
     headword_lemma = doc.createElement("lemma")
+
+#     headword_lemma = entry.original_xml.querySelector("head headword lemma")
+
     headword_lemma.textContent = entry.headword
     if entry.headword_type is not None:
         headword_lemma.setAttribute("type", entry.headword_type)
+    if entry.headword_audio is not None:
+        headword_lemma.setAttribute("audio", entry.headword_audio)
     headword.appendChild(headword_lemma)
     head.appendChild(headword)
 
@@ -52,11 +57,18 @@ 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:
         measure_list = doc.createElement("measureList")
@@ -125,7 +137,9 @@ def export_sense(doc, sense):
 
     for example in sense.examples:
         example_container = example.export(doc)
-        export_translation_list(doc, example, example_container)
+        translation_container_list = doc.createElement("translationContainerList")
+        export_translation_list(doc, example, translation_container_list)
+        example_container.appendChild(translation_container_list)
         example_container_list.appendChild(example_container)
 
     return sense_xml
@@ -146,16 +160,27 @@ def export_translation(doc, translation):
     actual_t.textContent = translation.translation
     actual_t.setAttribute("targetLang", translation.targetLang)
 
+    if translation.audio:
+        actual_t.setAttribute("audio", translation.audio)
+
     if translation.source:
         actual_t.setAttribute("source", translation.source)
     translation_xml.appendChild(actual_t)
 
-    explanation = doc.createElement("explanation")
+    if len(translation.explanationList) > 0 :
-    explanation.textContent = translation.explanation
+        explanationList = _export_explanation_list(doc, translation.explanationList)
-    translation_xml.appendChild(explanation)
+        translation_xml.appendChild(explanationList)
+
+
 
     return translation_xml
 
+def _export_explanation_list(doc, lst):
+    result = doc.createElement('explanationList')
+    for explanation in lst:
+            result.appendChild(explanation.export(doc))
+
+    return result
 
 def _export_label_list(doc, lst):
     result = doc.createElement("labelList")

src/lib/structure_conversions.py

@@ -34,12 +34,23 @@ def build_structure_conversions():
         structure_conversions.append((__new__(RegExp(vfrom, 'u')), vto_name, vto_id))
         
         
-def convert_structure(structure):
+def convert_structure(structure, type):
     if structure_conversions is None:
         build_structure_conversions()
     
     for vfrom, vto_name, vto_id in structure_conversions:
         match = structure.match(vfrom)
+        # 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 = '65'
+        elif match and vto_id == '64' and '-g' in type:
+            vto_name = 'gg-vp-gg'
+            vto_id = '66'
+        elif match and vto_id == '64' and '-r' in type:
+            vto_name = 'r-vp-r'
+            vto_id = '67'
+
         if match:
             # we need to remove replace alias here as we want to use javascript's one
             __pragma__('noalias', 'replace')
@@ -49,4 +60,4 @@ def convert_structure(structure):
             return result, vto_id
     
     window.console.log("Unknown structure: ", structure)
-    return None
+    return 'N/A', '/'

src/message/common_accessors.py

@@ -10,16 +10,19 @@ def generic_list_getter():
     return result
 
 # Formats data from inputs to name-value objects
-def homonymy_list_getter():
+def double_list_getter(firstParameter, secondParameter, allowEmptyField = False):
     result = []
-    for row in document.getElementsByClassName("label-list-row"):
+    for row in document.getElementsByClassName("double-list-row"):
-        value = row.querySelector(".value-input").value
+        firstValue = row.querySelector("." + firstParameter + "-input").value
-        name = row.querySelector(".name-input").value
+        secondValue = row.querySelector("." + secondParameter + "-input").value
 
-        if ("" in [name, value]):
+        if (allowEmptyField is False and '' in [firstValue, secondValue]):
             continue
 
-        result.append({"name": name, "value": value})
+        if (allowEmptyField is True and all('' == value or value.isspace() for value in [firstValue, secondValue])):
+            continue
+
+        result.append({firstParameter: firstValue, secondParameter: secondValue})
 
     return result
 

src/message/simple_edits.py

@@ -90,7 +90,7 @@ class EditVariants(Message):
 
 class EditHomonymy(Message):
     def update_model(self, model):
-        homonymy = common_accessors.homonymy_list_getter()
+        homonymy = common_accessors.double_list_getter("value", "name")
         model.entry.homonymy = homonymy
 
 

src/message/ske_messages.py

@@ -26,6 +26,7 @@ class SkeExample:
         self.mid = ""
         self.s_id = ""
         self.gf2_good = None
+        self.gf2_check = False
     
     @staticmethod
     def fromLine(line):
@@ -58,15 +59,7 @@ class SkeCollocation:
     def __init__(self, data):
         self.word = data.word
         self.frequency = data.count
-        
+        self.structure_name, self.structure_id = convert_structure(data.gramrel, data.lempos)
-        info = convert_structure(data.gramrel)
-        if info is None:
-            self.structure_name = None
-            self.structure_id = None
-        else:
-            self.structure_name = info[0]
-            self.structure_id = info[1]
-            
         
         self.other = {"score": data.score, "cm": data.cm}
 
@@ -148,7 +141,7 @@ class SkeModal(ClickMessage):
         elif type(data) is list:
             window.console.log(data)
             # check if gf2 examples are loaded or not
-            if data[0].gf2_good is None:
+            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)
  
@@ -169,12 +162,18 @@ class SkeModalGf2Update(SkeModal):
             example.gf_good = False
             data_dict[example.s_id] = example
             
+        bad_response = dict(response_data["bad"])
+        for gf_sid, gf_data in bad_response.items():
+            data_dict[gf_sid].gf2_good = None
+            data_dict[gf_sid].gf2_check = True
+
         good_response = dict(response_data["good"])
         for gf_sid, gf_data in good_response.items():
             data_dict[gf_sid].left = gf_data.left
             data_dict[gf_sid].mid = gf_data.mid
             data_dict[gf_sid].right = gf_data.right
             data_dict[gf_sid].gf2_good = True
+            data_dict[gf_sid].gf2_check = True
         
         # changed data_dict, now we can redraw!
         # just let it do its thing in update_model
@@ -225,6 +224,8 @@ class SkeInsert(DataChgClickMessage):
                 console.log("You really should not be here, my lady")
                 continue
         
+        model.reset()
+    
     def _as_corpus_example(self, example):
         new_example = Example()
         new_example.inner = CorpusExample()

src/message/translation_edit.py

@@ -4,6 +4,7 @@ import message.common_accessors as common_accessors
 from browser import document, window
 from model.translation import Translation
 from model.sense import Sense
+from model.explanation import Explanation
 
 
 
@@ -13,8 +14,14 @@ class EditTranslation(DataChgClickMessage):
         self.old_cluster_idx = self.get_arg(1, int)
 
         self.translation.translation = document.getElementById("etv").value
-        self.translation.explanation = document.getElementById("ete").value
+#         This could be dangerous if double_list_getter is getting data from any other list as well.
-        
+        explanations = common_accessors.double_list_getter('value', 'language', True)
+        self.translation.explanationList = []
+        for entry in explanations:
+            explanation = Explanation()
+            explanation.value = entry.value
+            explanation.language = entry.language
+            self.translation.explanationList.append(explanation)
         # common_accessors.label_list_getter()
         self.translation.tags = common_accessors.label_list_getter()
 

src/model/__init__.py

@@ -2,3 +2,4 @@ from model.model import Model
 from model.sense import Sense
 from model.translation import Translation
 from model.example import Example
+from model.explanation import Explanation

src/model/entry.py

@@ -14,6 +14,7 @@ class Entry(Data):
         self.headword = ""
         self.homonymy = []
         self.headword_type = None
+        self.headword_audio = None
         self.grammar = ""
         self.comment = ""
         self.variants = []
@@ -22,16 +23,20 @@ class Entry(Data):
         self.measure = {}
         self.labels = []
         self.senses = []
+        self.original_xml = None
 
     def import_xml(self, entry_xml):
+        self.original_xml = entry_xml.cloneNode(True)
         status = entry_xml.querySelector("head status")
+
         headword = entry_xml.querySelector("head headword lemma")
 
         grammar = entry_xml.querySelector("head grammar category")
         comment = entry_xml.querySelector("head comment")
         self.status = status.textContent if status else ""
         self.headword = headword.textContent if headword else ""
-        self.headword_type = headword.getAttribute("type") if headword else None
+        self.headword_type = headword.getAttribute("type") if headword and headword.hasAttribute("type") else None
+        self.headword_audio = headword.getAttribute("audio") if headword and headword.hasAttribute("audio") else None
         self.grammar = grammar.textContent if grammar else ""
         self.comment = comment.textContent if comment else ""
         self.variants = [v.textContent for v in entry_xml.querySelectorAll("head variantList variant")]

src/model/example/component_lexeme.py

@@ -19,11 +19,10 @@ class ComponentLexeme(Data):
         else:
             self.text = xml.textContent
             self.role = xml.getAttribute("role")
-            
             if xml.hasAttribute("space"):
                 self.no_space = xml.getAttribute("space") == "false"
 
-            for oth_attr in ["lexical_unit_lexeme_id", "slolex", "kol"]:
+            for oth_attr in ["lexeme_id", "lexical_unit_lexeme_id", "slolex", "kol", "sloleks"]:
                 if xml.hasAttribute(oth_attr):
                     self.other_attributes[oth_attr] = xml.getAttribute(oth_attr)
 
@@ -33,7 +32,6 @@ class ComponentLexeme(Data):
     def export(self, doc):
         if self.role is None:
             return doc.createTextNode(self.text)
-        
         result = doc.createElement("comp")
         result.setAttribute("role", self.role)
         result.textContent = self.text

src/model/example/example.py

@@ -40,7 +40,7 @@ class Example(Data):
         return example
 
     def import_xml(self, example_xml):
-        self.translations = from_container_list(example_xml.querySelectorAll("translationContainer"))
+        self.translations = from_container_list(example_xml.querySelectorAll("translationContainerList translationContainer"))
 
         if example_xml.hasAttribute("modified"):
             self.edited = example_xml.getAttribute("modified") == "true"

src/model/explanation.py

@@ -0,0 +1,21 @@
+from model.data import Data
+
+from lib.snabbdom import h
+
+
+class Explanation(Data):
+    def __init__(self):
+        self.value = ""
+        self.language = ""
+
+    def import_dom(self, explanation_dom):
+
+        self.value = explanation_dom.textContent if explanation_dom else ""
+        self.language = explanation_dom.getAttribute("language") if explanation_dom.hasAttribute("language") else ""
+
+    def export(self, doc):
+        result = doc.createElement("explanation")
+        result.textContent = self.value
+        if self.language != "": result.setAttribute('language', self.language)
+
+        return result

src/model/sense.py

@@ -18,14 +18,14 @@ class Sense(Data):
 
     def import_xml(self, sense_xml, idx):
         self.original_idx = idx
+
         for definition in sense_xml.querySelectorAll("definitionList definition"):
             key = definition.getAttribute("type")
             self.definition[key] = definition.textContent
 
         self.labels = import_label_list("sense > labelList label", sense_xml)
         self.translations = from_container_list(
-            sense_xml.querySelectorAll("translationContainerList translationContainer"))
+            sense_xml.querySelectorAll('sense > translationContainerList translationContainer'))
-        
         for example_xml in sense_xml.querySelectorAll("exampleContainerList exampleContainer"):
             example = Example()
             example.import_xml(example_xml)

src/model/translation.py

@@ -1,4 +1,5 @@
 from model.tags import import_label_list
+from model.explanation import Explanation
 from model.data import Data
 
 from lib.snabbdom import h
@@ -32,7 +33,8 @@ class Translation(Data):
         self.translation = ""
         self.source = ""
         self.targetLang = ""
-        self.explanation = ""
+        self.audio = ""
+        self.explanationList = set()
         self.tags = []
 
     def import_xml(self, translation_xml):
@@ -42,12 +44,16 @@ class Translation(Data):
             self.translation = translation.textContent
             self.source = translation.getAttribute("source") if translation.hasAttribute("source") else ""
             self.targetLang = translation.getAttribute("targetLang")  if translation.hasAttribute("targetLang") else ""
+            self.audio = translation.getAttribute("audio")  if translation.hasAttribute("audio") else ""
+
+        explanationList = translation_xml.querySelectorAll("explanationList explanation")
+        for explanation_dom in explanationList:
+            explanation = Explanation()
+            explanation.import_dom(explanation_dom)
+            self.explanationList.append(explanation)
 
-        explanation = translation_xml.querySelector("explanation")
-        self.explanation = explanation.textContent if explanation else ""
         self.tags = import_label_list("labelList label", translation_xml)
 
-    
     def view(self, model):
         elements = []
 
@@ -61,8 +67,10 @@ class Translation(Data):
         if self.source:
             elements.append(h("span.translation-source", {}, self.source))
 
-        explanation_class = ".translation-explanation" if self.translation else ""
+        if (self.explanationList):
-        elements.append(h("span{}".format(explanation_class), {}, self.explanation))
+            explanation_class = ".explanations" if self.translation else ".explanations.solo"
+            explanations = [explanation.value for explanation in self.explanationList]
+            elements.append(h("span{}".format(explanation_class), {}, ", ".join(explanations)))
 
         return h("div.translation-div", {"on": {"click": M.msg(M.ShowTranslationMenu, self) }}, elements)
 
@@ -73,6 +81,6 @@ class Translation(Data):
         # next two are not checked as the also can not be deleted via gui
         # result = result and self.source == ""
         # result = result and self.targetLang == ""
-        result = result and self.explanation == ""
+        result = result and len(self.explanationList) == 0
         result = result and len(self.tags) == 0
         return result

src/view/modal_templates.py

@@ -49,7 +49,7 @@ def generic_list_editor(title, element_list_getter):
 
 def homonymy_editor(title, current_labels):
     def split_line2(left, right):
-        cls = "flex.two{}".format(".label-list-row")
+        cls = "flex.two{}".format(".double-list-row")
         return h("div.{}".format(cls), {}, [
             h("div.half", {}, left), h("div.half", {}, right)])
 
@@ -67,6 +67,28 @@ def homonymy_editor(title, current_labels):
 
     return content
 
+def explanation_editor(title, current_labels):
+    def split_line2(left, right):
+            cls = "flex.two{}".format(".double-list-row")
+            return h("div.{}".format(cls), {}, [
+                h("div.four-fifth", {}, left), h("div.fifth", {}, right)])
+
+    content = [h("p", {}, title)]
+    for i, explanation in enumerate(current_labels()):
+        language = []
+        value = []
+        language.append(h("label", {"attrs": {"for": i}}, "Language:"))
+        language.append(h("input.language-input", {"props": {"type": "text", "value": explanation["language"], "id": i}}, ""))
+        value.append(h("label", {"attrs": {"for": i + "-value"}}, "Value:"))
+        value.append(h("input.value-input", {"props": {"type": "text", "value": explanation["value"], "id": i + "-value"}}, ""))
+
+        content.append(split_line2(value, language))
+    content.append(h("button", {"on": {"click": message.msg(message.AddToGenericList, current_labels)}}, "+"))
+
+    return content
+
+
+
 def label_list_editor(current_labels, add_label_message_class):
     def split_line3(left, center, right, is_llr=True):
         cls = "flex.three{}".format(".label-list-row" if is_llr else "")

src/view/modals.py

@@ -19,10 +19,9 @@ def edit_translation(translation, parent, cluster_idx, num_clusters, cls):
 
     # first line: transalation itself
     content.extend([
-        split_line2("Prevedek:",
+        split_line2("Prevedek:", h("textarea#etv", {"props": {"value": translation.translation}}, ""))])
-                    h("textarea#etv", {"props": {"value": translation.translation}}, "")),
+
-        split_line2("Razlaga:",
+    content.extend(explanation_editor("Razlage:", lambda: translation.explanationList))
-                    h("textarea#ete", {"props": {"value": translation.explanation}}, ""))])
 
     # cluster number
     options = [h("option", {"props": {"selected": idx == cluster_idx}}, str(idx + 1)) for idx in range(num_clusters + 1)]