Actually reading examples, not just quick hack :)

src/model/example.py

@@ -1,19 +1,95 @@
 from model.editable import Editable
 from model.translation import from_container_list
 
+
 class Example(Editable):
-    def __init__(self, example_xml):
+    @staticmethod
-        # example = example_xml.querySelector("example")
+    def from_xml(example_xml):
-        # self.example = example.textContent if example else ""
-        
         ce_xml = example_xml.querySelector("corpusExample")
         if ce_xml is not None:
-            self.example_type = "corpus"
+            return CorpusExample(example_xml)
-            inner_xml = ce_xml
         else:
-            self.example_type = "multiword"
+            return MultiwordExample(example_xml)
-            inner_xml = example_xml.querySelector("multiwordExample")
+    
+    
+    @staticmethod
+    def add_clusters(entry):
+        nocluster_examples = []
+        taken_clusters = []
+        
+        # gahter all taken cluster numbers and all examples without clusters
+        for sense in entry.senses:
+            for example in sense.examples:
+                cluster = example.get_cluster()
+                if cluster == -1:
+                    nocluster_examples.append(example)
+                elif cluster is not None:
+                    taken_clusters.append(cluster)
+        
+        cnum = 1
+        for example in nocluster_examples:
+            while cnum in taken_clusters:
+                cnum += 1
+            taken_clusters.append(cnum)
             
-        self.original_xml = inner_xml
+            example.cluster = cnum
-        self.text = inner_xml.textContent
+            
+        
+    def __init__(self, example_xml):
         self.translations = from_container_list(example_xml.querySelectorAll("translationContainer"))
+        self.components = [ComponentLexeme(el) for el in example_xml.querySelectorAll("comp")]
+    
+    
+    def get_cluster(self):
+        return None
+    
+    def get_valid_cluster(self):
+        return None
+    
+    def text(self):
+        return " ".join([comp.text for comp in self.components])
+        
+            
+class CorpusExample(Example):
+    def __init__(self, example_xml):
+        super().__init__(example_xml)
+        xml = example_xml.querySelector("corpusExample")
+        
+        self.other_attributes = {}
+        for oth_attr in ["example_id", "modified", "lexical_unit_id", "audio"]:
+            if xml.hasAttribute(oth_attr):
+                self.other_attributes[oth_attr] = xml.getAttribute(oth_attr)
+            
+
+class MultiwordExample(Example):
+    def __init__(self, example_xml):
+        super().__init__(example_xml)
+        xml = example_xml.querySelector("multiwordExample")
+        
+        self.other_attributes = {}
+        for oth_attr in ["type", "lexical_unit_id", "structure_id", "structureName", "audio", "frequency", "logDice"]:
+            if xml.hasAttribute(oth_attr):
+                self.other_attributes[oth_attr] = xml.getAttribute(oth_attr)
+        
+        self.cluster_valid = False
+        self.cluster = -1
+        if xml.hasAttribute("cluster"):
+            self.cluster_valid = True
+            self.cluster = int(xml.getAttribute("cluster"))
+        
+    def get_cluster(self):
+        return self.cluster
+    
+    def get_valid_cluster(self):
+        return self.cluster if self.cluster_valid else None 
+
+
+class ComponentLexeme:
+    def __init__(self, xml):
+        self.text = xml.textContent
+        self.role = xml.getAttribute("role")
+
+        self.other_attributes = {}
+        for oth_attr in ["lexical_unit_lexeme_id", "slolex", "kol"]:
+            if xml.hasAttribute(oth_attr):
+                self.other_attributes[oth_attr] = xml.getAttribute(oth_attr)

src/view/modals.py

@@ -37,7 +37,7 @@ def edit_sense_label(sense):
     
 
 def edit_example(example):
-    content = question("Edit example", example.text)
+    content = question("Edit example", example.text())
     return modal_template(content, "Edit Example", message.EditExampleTranslation(example))
 
 

src/view/view.py

@@ -108,7 +108,7 @@ class View:
         return h("div.example", {}, [
           h("div.example-dot", {}, "▣"),
           h(example_tag, {}, [
-            h("span.example-text", {"on": {"click": msg(ShowExampleMenu(example))} }, example.text),
+            h("span.example-text", {"on": {"click": msg(ShowExampleMenu(example))} }, example.text()),
             h("div.example-translation-list", {}, [
                 h("div.example-translation", {}, [
                     h("span.example-arrow", {}, "↪"),