Minor changes to TEI, TEX and Textual output formats.

Bartłomiej Nitoń
1 parent 8d5f92e9
Showing 5 changed files with 67 additions and 44 deletions
dictionary/ajax_vocabulary_management.py
dictionary/models.py
dictionary/teixml.py
dictionary/templates/tex/slowal.tex
dictionary/templatetags/tex_tags.py
@@ -155,6 +155,8 @@ def create_text_walenty(file_name, lemmas, vocabularies, frame_opinions,
                                                                               pred_val=pred_val, 
                                                                               aspect_val=aspect_val).order_by('text_rep')                     
                             for frame in matching_frames:
+                                if not lemma.phraseology_ready() and frame.phraseologic:
+                                    continue
                                 if not frame_opinions or founded_frame_opinions.filter(frame=frame).exists():
                                     text_rep = frame.get_position_spaced_text_rep()
                                     if add_frame_opinions:
@@ -250,6 +250,20 @@ class Lemma(Model):
         except Frame_Opinion.DoesNotExist:
             pass
         return frame_opinion_name
+    
+    def phraseology_ready(self):
+        actual_status = self.status
+        ready_f_status = Lemma_Status.objects.get(type__sym_name='ready_f')
+        if actual_status.priority >= ready_f_status.priority:
+            return True
+        return False
+        
+    def semantics_ready(self):
+        actual_status = self.status
+        ready_s_status = Lemma_Status.objects.get(type__sym_name='ready_s')
+        if actual_status.priority >= ready_s_status.priority:
+            return True
+        return False
  
     class Meta:
       db_table = 'hasla'
@@ -26,7 +26,6 @@ File with functions responsible for creating TEI xml.
 '''
  
 import datetime
-import operator
  
 from lxml import etree
 from xml.sax.saxutils import escape
@@ -41,7 +40,7 @@ XML_NAMESPACE = &#39;http://www.w3.org/XML/1998/namespace&#39;
 def createteixml(outpath, lemmas, frame_opinion_values):
     root = write_root()
     write_header(root)
-    #lemmas = lemmas.filter(entry=u'brnąć')
+    #lemmas = lemmas.filter(entry=u'żywić')
     write_entries(root, lemmas, frame_opinion_values)
     with open(outpath, 'w') as output_file:
         output_file.write(etree.tostring(root, pretty_print=True, 
@@ -92,9 +91,10 @@ def write_entry(body_elem, lemma, frame_opinions, frame_opinion_values):
  
     write_syntactic_layer(entry_elem, lemma, frame_opinions, frame_opinion_values)
     write_examples_layer(entry_elem, lemma)
-    write_semantic_layer(entry_elem, lemma)
-    write_meanings_layer(entry_elem, lemma)
-    write_connections_layer(entry_elem, lemma)
+    if lemma.semantics_ready():
+        write_semantic_layer(entry_elem, lemma)
+        write_meanings_layer(entry_elem, lemma)
+        write_connections_layer(entry_elem, lemma)
  
 def write_syntactic_layer(entry_elem, lemma, frame_opinions, frame_opinion_values):
     synt_layer_fs_elem = etree.SubElement(entry_elem, 'fs')
@@ -113,12 +113,12 @@ def write_syntactic_layer(entry_elem, lemma, frame_opinions, frame_opinion_value
                                                                      pred_val=pred_val, 
                                                                      aspect_val=aspect_val).order_by('text_rep')
                     for frame in matchingframes:
-                        if (not frame_opinion_values.exists() or 
-                            frame_opinions.filter(frame=frame).exists()):  
+                        if not lemma.phraseology_ready() and frame.phraseologic:
+                            continue
+                        if (not frame_opinion_values.exists() or frame_opinions.filter(frame=frame).exists()):  
                             write_schema(vColl_elem, frame, lemma)
  
 def write_schema(parent_elem, schema, lemma):
-    
     schema_xml_id = 'wal_%s.%s-sch' % (str(lemma.entry_obj.id), str(schema.id))
  
     schema_fs_elem = etree.SubElement(parent_elem, 'fs')
@@ -420,20 +420,24 @@ def write_examples_layer(parent_elem, lemma):
     write_examples_feature(vColl_elem, lemma)
  
 def write_examples_feature(parent_elem, lemma):
-    entry = lemma.entry_obj
     for example in lemma.nkjp_examples.order_by('opinion__priority').all():
-        write_example(parent_elem, entry, example)  
+        if not lemma.phraseology_ready() and example.frame.phraseologic:
+            pass
+        else:
+            write_example(parent_elem, lemma, example)  
     for example in lemma.lemma_nkjp_examples.order_by('opinion__priority').all():
-        write_example(parent_elem, entry, example)
+        write_example(parent_elem, lemma, example)
  
-def write_example(parent_elem, entry, example):
+def write_example(parent_elem, lemma, example):
+    entry = lemma.entry_obj
     example_xml_id = u'wal_%s.%s-exm' % (str(entry.id), str(example.id))
  
     example_fs_elem = etree.SubElement(parent_elem, 'fs')
     example_fs_elem.attrib[etree.QName(XML_NAMESPACE, 'id')] = example_xml_id
     example_fs_elem.attrib['type'] = 'example'
  
-    get_and_write_meaning_link(example_fs_elem, entry, example)
+    if lemma.semantics_ready():
+        get_and_write_meaning_link(example_fs_elem, entry, example)
     write_phrases_links(example_fs_elem, entry, example)
  
     sentence_f_elem = etree.SubElement(example_fs_elem, 'f')
@@ -519,9 +523,19 @@ def write_frame_fs(parent_elem, entry, frame):
     frame_fs_elem.attrib[etree.QName(XML_NAMESPACE, 'id')] = frame_xml_id
     frame_fs_elem.attrib['type'] = 'frame'
  
+    write_frame_opinion(frame_fs_elem, frame)
     write_frame_meanings(frame_fs_elem, entry, frame)
     write_frame_arguments(frame_fs_elem, entry, frame)
  
+def write_frame_opinion(parent_elem, frame):
+    frame_opinion = 'unk'
+    if frame.opinion_selected():
+        frame_opinion = frame.opinion.short
+    opinion_f_elem = etree.SubElement(parent_elem, 'f')
+    opinion_f_elem.attrib['name'] = 'opinion'
+    opinion_symbol = etree.SubElement(opinion_f_elem, 'symbol')
+    opinion_symbol.attrib['value'] = frame_opinion
+    
 def write_frame_meanings(parent_elem, entry, frame):
     meanings_f_elem = etree.SubElement(parent_elem, 'f')
     meanings_f_elem.attrib['name'] = 'meanings'
@@ -734,39 +748,30 @@ def write_connections_layer(parent_elem, lemma):
 def write_alternations(parent_elem, lemma):
     entry = lemma.entry_obj
     frames = entry.actual_frames()
-    
     for schema in lemma.frames.all():
         for frame in frames:
             matching_complements = frame.complements.filter(realizations__frame=schema).distinct()
-            if matching_complements.filter(realizations__alternation=1).exists():
-                alternation_fs_elem = etree.SubElement(parent_elem, 'fs')
-                alternation_fs_elem.attrib['type'] = 'alternation'
-                
-                connections_f_elem = etree.SubElement(alternation_fs_elem, 'f')
-                connections_f_elem.attrib['name'] = 'connections'
-                
-                vColl_elem = etree.SubElement(connections_f_elem, 'vColl')
-                vColl_elem.attrib['org'] = 'set'
-                
-                for arg in frame.complements.all():
-                    alt_realizations = arg.realizations.filter(frame=schema, alternation=1)
-                    if alt_realizations.exists():
-                        write_connection(vColl_elem, entry, frame, arg, alt_realizations)
-            
-            if matching_complements.filter(realizations__alternation=2).exists():
-                alternation_fs_elem = etree.SubElement(parent_elem, 'fs')
-                alternation_fs_elem.attrib['type'] = 'alternation'
-                
-                connections_f_elem = etree.SubElement(alternation_fs_elem, 'f')
-                connections_f_elem.attrib['name'] = 'connections'
-                
-                vColl_elem = etree.SubElement(connections_f_elem, 'vColl')
-                vColl_elem.attrib['org'] = 'set'
-                      
-                for arg in frame.complements.all():
-                    alt_realizations = arg.realizations.filter(frame=schema, alternation=2)
-                    if alt_realizations.exists():
-                        write_connection(vColl_elem, entry, frame, arg, alt_realizations)
+            write_alternation(parent_elem, entry, schema, frame, matching_complements, 1)
+            write_alternation(parent_elem, entry, schema, frame, matching_complements, 2)
+                        
+def write_alternation(parent_elem, entry, schema, frame, complements, alternation):
+    alternation_compls = complements.filter(realizations__alternation=alternation)
+    if alternation_compls.exists():
+        first_connection = True 
+        for arg in alternation_compls.all():
+            alt_realizations = arg.realizations.filter(frame=schema, alternation=alternation)
+            if alt_realizations.exists():
+                if first_connection:
+                    alternation_fs_elem = etree.SubElement(parent_elem, 'fs')
+                    alternation_fs_elem.attrib['type'] = 'alternation'
+                    
+                    connections_f_elem = etree.SubElement(alternation_fs_elem, 'f')
+                    connections_f_elem.attrib['name'] = 'connections'
+                    
+                    vColl_elem = etree.SubElement(connections_f_elem, 'vColl')
+                    vColl_elem.attrib['org'] = 'set'
+                    first_connection = False   
+                write_connection(vColl_elem, entry, frame, arg, alt_realizations)
  
 def write_connection(parent_elem, entry, frame, arg, realizations):
     connection_fs_elem = etree.SubElement(parent_elem, 'fs')
@@ -48,7 +48,7 @@
 \begin{document}
  
 {% for lemma in lemmas %}
-  {% lemma_tex lemma forloop.counter0 q_frame_opinions sort_reflex_vals sort_aspect_vals sort_neg_vals sort_pred_vals download_dict %}
+  {% lemma_tex lemma forloop.counter0 q_frame_opinions download_dict %}
 {% endfor %}
  
 \end{document}
@@ -103,6 +103,8 @@ def lemma_tex(lemma, loop_counter, q_frame_opinions, download_dict):
                                                                 pred_val=pred_val, 
                                                                 aspect_val=aspect_val).order_by('text_rep')                          
               for frame in matching_frames:
+                if not lemma.phraseology_ready() and frame.phraseologic:
+                    continue
                 if not download_dict['frame_opinions'] or (frame_opinions and frame_opinions.filter(frame=frame).count() > 0):
                   frames.append(frame)             
   return {'lemma': lemma,