Removed confirm button from lemma examples view. Updated get_stats function.

Bartłomiej Nitoń
1 parent d28cc548
Showing 7 changed files with 43 additions and 81 deletions
dictionary/ajax_argument_form.py
dictionary/ajax_vocabulary_management.py
dictionary/models.py
dictionary/static/js/lemma-view.js
dictionary/teixml.py
dictionary/templates/lemma_examples.html
dictionary/templatetags/tex_tags.py
@@ -59,7 +59,7 @@ def argument_form(request, form_data, lemma_id, position_arguments,
     lemma_pos = None
     if lemma_id:
         lemma_obj = Lemma.objects.get(pk=lemma_id)
-        lemma_pos = Entry.objects.get(name=lemma_obj.entry).pos
+        lemma_pos = lemma_obj.entry_obj.pos
     # jesli wybieramy argument do pozycji w modyfikacji lub jeden 
     # z argumentow do zleksykalizowanego compara to dostepne sa modele argumentow
     # dla wszystkich czesci mowy
@@ -36,8 +36,7 @@ from django.utils.encoding import smart_str
 from common.decorators import ajax, AjaxError, render
 from dictionary.forms import ManageVocabPermForm
 from dictionary.models import Frame_Opinion_Value, Lemma, Lemma_Status, \
-                              POS, Vocabulary, VocabularyFormat, WalentyStat,\
-                              sorted_frame_char_values_dict
+                              POS, Vocabulary, VocabularyFormat, WalentyStat
 from dictionary.teixml import createteixml
  
 TEXT_VOCABULARY_CLAUSE = u"""
@@ -128,17 +127,12 @@ def create_tei_walenty(lemmas, form_dict):
     os.chdir(tmp_folder)      
     tmpfile, tmpfilename = mkstemp(dir=tmp_folder)
     os.close(tmpfile)
-    frame_chars_dict = sorted_frame_char_values_dict()
     q_frame_opinions = []
     if form_dict['frame_opinions']:
         for pk in form_dict['frame_opinions']:
             q_frame_opinions.append(Q(value__pk=pk))
     createteixml(tmpfilename, 
-                 lemmas, 
-                 sort_reflex_vals=frame_chars_dict['sorted_reflex_vals'],
-                 sort_aspect_vals=frame_chars_dict['sorted_aspect_vals'], 
-                 sort_neg_vals=frame_chars_dict['sorted_neg_vals'],
-                 sort_pred_vals=frame_chars_dict['sorted_pred_vals'],
+                 lemmas,
                  frame_char_models=[],
                  form_dict=form_dict, 
                  q_frame_opinions=q_frame_opinions)
@@ -154,11 +148,11 @@ def create_text_walenty(file_name, lemmas, vocabularies, frame_opinions,
                                       lemma_statuses, owners, poss, add_frame_opinions))
         for lemma in lemmas:
             founded_frame_opinions = lemma.frame_opinions.filter(value__in=frame_opinions)  
-            frame_chars_dict = sorted_frame_char_values_dict()  
-            for reflex_val in frame_chars_dict['sorted_reflex_vals']:
-                for neg_val in frame_chars_dict['sorted_neg_vals']:
-                    for pred_val in frame_chars_dict['sorted_pred_vals']:
-                        for aspect_val in frame_chars_dict['sorted_aspect_vals']:
+            #frame_chars_dict = sorted_frame_char_values_dict()  
+            for reflex_val in lemma.get_existing_frame_char_values(u'ZWROTNOŚĆ'):
+                for neg_val in lemma.get_existing_frame_char_values(u'NEGATYWNOŚĆ'):
+                    for pred_val in lemma.get_existing_frame_char_values(u'PREDYKATYWNOŚĆ'):
+                        for aspect_val in lemma.get_existing_frame_char_values(u'ASPEKT'):
                             matching_frames = lemma.get_frames_by_char_values(reflex_val=reflex_val, 
                                                                               neg_val=neg_val, 
                                                                               pred_val=pred_val, 
@@ -207,7 +201,6 @@ def create_copyrights_str(vocabularies_pks, frame_opinions_pks,
     return copyrights
  
 def create_tex_walenty(lemmas, form_dict):
-    frame_chars_dict = sorted_frame_char_values_dict()
     q_frame_opinions = []
     if form_dict['frame_opinions']:
         for pk in form_dict['frame_opinions']:
@@ -219,10 +212,6 @@ def create_tex_walenty(lemmas, form_dict):
     # Pass the TeX template through Django templating engine and into the temp file
     os.write(tmpfile, smart_str(h.unescape(render_to_string('tex/slowal.tex', {'lemmas': lemmas, 
                                                             'q_frame_opinions': q_frame_opinions,
-                                                            'sort_reflex_vals': frame_chars_dict['sorted_reflex_vals'],
-                                                            'sort_aspect_vals': frame_chars_dict['sorted_aspect_vals'],
-                                                            'sort_neg_vals'   : frame_chars_dict['sorted_neg_vals'],
-                                                            'sort_pred_vals'  : frame_chars_dict['sorted_pred_vals'],
                                                             'download_dict'   : form_dict}))))
     os.close(tmpfile)
     file_name = tmpfilename + '.tex'
@@ -379,8 +368,7 @@ def get_stats(statuses, pos):
     return stats_dict
  
 def get_sub_entries_dict(lemma):
-    sub_entries_dict = {'sub_lemmas': 0}
-    #frame_chars_dict = sorted_frame_char_values_dict()  
+    sub_entries_dict = {'sub_lemmas': 0} 
     for reflex in lemma.get_existing_frame_char_values(u'ZWROTNOŚĆ'):
         for neg in lemma.get_existing_frame_char_values(u'NEGATYWNOŚĆ'):
             for pred in lemma.get_existing_frame_char_values(u'PREDYKATYWNOŚĆ'):
@@ -213,7 +213,7 @@ class Lemma(Model):
                                     blank=True, null=True, related_name='lemmas')
  
     def __unicode__(self):
-      return '%s (%s)' % (self.entry, self.vocabulary)
+        return '%s (%s)' % (self.entry, self.vocabulary)
  
     def get_frames_by_char_values(self, reflex_val, neg_val, pred_val, aspect_val):
         matching_frames = self.frames.filter(characteristics__value=reflex_val
@@ -227,8 +227,9 @@ class Lemma(Model):
         for frame in self.frames.all():
             char_value = frame.get_char_value(char_type)
             if not char_value in char_vals:
-                char_vals.append(char_value)
-        return char_vals
+                char_vals.append(char_value.pk)
+        char_vals_query = Frame_Char_Value.objects.filter(pk__in=char_vals)
+        return char_vals_query.order_by('-priority')
  
     def contains_frame_with_exact_positions(self, positions):
         contains = False
@@ -766,7 +766,6 @@ function selectLemmaNkjpTr(id)
  
   	nkjpInstance = getNkjpLemmaExampleInstance(window.nkjp_lemma_examples, id);
   	fill_nkjp_example_form(nkjpInstance, '.lemma-example-form');
-  	needConfirmation(nkjpInstance);
   }
 }
  
@@ -822,19 +821,11 @@ function needConfirmation(nkjpInstance) {
       },
  
     callback: function(result) {      
-      if(result['can_confirm'])
-      {
-        if(nkjpInstance.frame_id)
+      if(result['can_confirm']) {
           $("button#confirm_example").css("visibility","visible");
-        else 
-          $("button#confirm_lemma_example").css("visibility","visible");
       }
-      else
-      {
-        if(nkjpInstance.frame_id)
+      else {
           $("button#confirm_example").css("visibility","hidden");
-        else
-          $("button#confirm_lemma_example").css("visibility","hidden");
       }   	
     },
     error_callback: function(xhr, status, error) {
@@ -39,14 +39,12 @@ from dictionary.models import Atribute_Model, Frame_Opinion_Value, Frame_Char_Mo
 XML_NAMESPACE = 'http://www.w3.org/XML/1998/namespace'
  
  
-def createteixml(outpath, lemmas, sort_reflex_vals,
-                   sort_aspect_vals, sort_neg_vals, sort_pred_vals, frame_char_models,
+def createteixml(outpath, lemmas, frame_char_models,
                    form_dict, q_frame_opinions):
     root = write_root()
     write_header(root)
     lemmas = lemmas.filter(entry=u'administrować')
-    write_entries(root, lemmas, sort_reflex_vals,
-                  sort_aspect_vals, sort_neg_vals, sort_pred_vals, frame_char_models, 
+    write_entries(root, lemmas, frame_char_models, 
                   form_dict, q_frame_opinions)
     with codecs.open(outpath, 'wt', 'utf-8') as output_file:
         output_file.write(etree.tostring(root, pretty_print = True))
@@ -75,8 +73,7 @@ def write_header(root):
     p = etree.SubElement(source_desc, 'p')
     p.text = 'File generated using Slowal. Mentioned tool available at: walenty.ipipan.waw.pl.'
  
-def write_entries(root, lemmas, sort_reflex_vals, 
-                   sort_aspect_vals, sort_neg_vals, sort_pred_vals, frame_char_models, 
+def write_entries(root, lemmas, frame_char_models, 
                    form_dict, q_frame_opinions):
     text = etree.SubElement(root, 'text')
     body = etree.SubElement(text, 'body')
@@ -84,13 +81,10 @@ def write_entries(root, lemmas, sort_reflex_vals,
         frame_opinions = None
         if q_frame_opinions:
             frame_opinions = lemma.frame_opinions.filter(reduce(operator.or_, q_frame_opinions))
-        write_entry(body, lemma, sort_reflex_vals, 
-                    sort_aspect_vals, sort_neg_vals, sort_pred_vals, frame_char_models,
+        write_entry(body, lemma, frame_char_models,
                     form_dict, frame_opinions)
  
-def write_entry(body_elem, lemma, sort_reflex_vals, 
-                 sort_aspect_vals, sort_neg_vals, sort_pred_vals, 
-                 frame_char_models, form_dict, frame_opinions):
+def write_entry(body_elem, lemma, frame_char_models, form_dict, frame_opinions):
     entry_xml_id = 'wal_%s-ent' % str(lemma.entry_obj.id)
     entry_elem = etree.SubElement(body_elem, 'entry')
     entry_elem.attrib[etree.QName(XML_NAMESPACE, 'id')] = entry_xml_id
@@ -101,19 +95,13 @@ def write_entry(body_elem, lemma, sort_reflex_vals,
     pos_elem = etree.SubElement(form_elem, 'pos')
     pos_elem.text = lemma.entry_obj.pos.tag
  
-    write_syntactic_layer(entry_elem, lemma, form_dict,
-                          sort_reflex_vals, sort_aspect_vals, 
-                          sort_neg_vals, sort_pred_vals,
-                          frame_opinions)
+    write_syntactic_layer(entry_elem, lemma, form_dict, frame_opinions)
     write_examples_layer(entry_elem, lemma)
     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, form_dict,
-                             sort_reflex_vals, sort_aspect_vals, 
-                             sort_neg_vals, sort_pred_vals,
-                             frame_opinions):
+def write_syntactic_layer(entry_elem, lemma, form_dict, frame_opinions):
     synt_layer_fs_elem = etree.SubElement(entry_elem, 'fs')
     synt_layer_fs_elem.attrib['type'] = 'syntacticLayer'
     schemata_f_elem =  etree.SubElement(synt_layer_fs_elem, 'f')
@@ -121,10 +109,10 @@ def write_syntactic_layer(entry_elem, lemma, form_dict,
     vColl_elem = etree.SubElement(schemata_f_elem, 'vColl')
     vColl_elem.attrib['org'] = 'set'
  
-    for reflex_val in sort_reflex_vals:
-        for neg_val in sort_neg_vals:
-            for pred_val in sort_pred_vals:
-                for aspect_val in sort_aspect_vals:
+    for reflex_val in lemma.get_existing_frame_char_values(u'ZWROTNOŚĆ'):
+        for neg_val in lemma.get_existing_frame_char_values(u'NEGATYWNOŚĆ'):
+            for pred_val in lemma.get_existing_frame_char_values(u'PREDYKATYWNOŚĆ'):
+                for aspect_val in lemma.get_existing_frame_char_values(u'ASPEKT'):
                     matchingframes = lemma.get_frames_by_char_values(reflex_val=reflex_val, 
                                                                      neg_val=neg_val, 
                                                                      pred_val=pred_val, 
@@ -606,13 +594,13 @@ def write_synsets_sel_prefs(parent_elem, arg):
             write_synset(vColl_elem, synset)
  
 def write_synset(parent_elem, synset):
-    synset_fs_elem = etree.SubElement(parent_elem, 'fs')
-    synset_fs_elem.attrib['type'] = 'synset'
-    
-    plWN_id_elem = etree.SubElement(synset_fs_elem, 'f')
-    plWN_id_elem.attrib['name'] = 'plwnid'
+#    synset_fs_elem = etree.SubElement(parent_elem, 'fs')
+#    synset_fs_elem.attrib['type'] = 'synset'
+#    
+#    plWN_id_elem = etree.SubElement(synset_fs_elem, 'f')
+#    plWN_id_elem.attrib['name'] = 'plwnid'
  
-    id_numeric_elem = etree.SubElement(plWN_id_elem, 'numeric')
+    id_numeric_elem = etree.SubElement(parent_elem, 'numeric')
     id_numeric_elem.attrib['value'] = str(synset.id)
  
 def write_predefined_sel_prefs(parent_elem, arg):
@@ -628,13 +616,13 @@ def write_predefined_sel_prefs(parent_elem, arg):
             write_predef(vColl_elem, predef)
  
 def write_predef(parent_elem, predef):
-    predef_fs_elem = etree.SubElement(parent_elem, 'fs')
-    predef_fs_elem.attrib['type'] = 'predef'
-    
-    name_f_elem = etree.SubElement(predef_fs_elem, 'f')
-    name_f_elem.attrib['name'] = 'name'
+#    predef_fs_elem = etree.SubElement(parent_elem, 'fs')
+#    predef_fs_elem.attrib['type'] = 'predef'
+#    
+#    name_f_elem = etree.SubElement(predef_fs_elem, 'f')
+#    name_f_elem.attrib['name'] = 'name'
  
-    name_symbol_elem = etree.SubElement(name_f_elem, 'symbol')
+    name_symbol_elem = etree.SubElement(parent_elem, 'symbol')
     name_symbol_elem.attrib['value'] = predef.name
  
 def write_relation_sel_prefs(parent_elem, arg, arg_base_id):
@@ -12,10 +12,6 @@
     assign_lemma_example(selected_lemma_example_id)
   });
  
-  $("button#confirm_lemma_example").click(function(){
-    confirm_lemma_example(selected_lemma_example_id)
-  });
-  
 </script>
  
 <strong>Przykłady niepasujące do żadnego schematu:</strong>
@@ -44,7 +40,6 @@
   {% if perms.dictionary.modify_lemma_examples %}
 	  <button type="button" id="delete_lemma_example" style="width:140px">Usuń</button>
 	  <button type="button" id="modify_lemma_example" style="width:140px">Modyfikuj</button>
-	  <button type="button" id="confirm_lemma_example" style="width:140px; visibility:hidden;">Potwierdź</button>
   {% endif %}
 </div>
 {% endif %}
@@ -84,8 +84,7 @@ def convtotex(example):
  
 # do pomocy przy pobieraniu slownika w formacie pdf
 @register.inclusion_tag('tex/lemma.tex')
-def lemma_tex(lemma, loop_counter, q_frame_opinions, sort_reflex_vals, 
-               sort_aspect_vals, sort_neg_vals, sort_pred_vals, download_dict):
+def lemma_tex(lemma, loop_counter, q_frame_opinions, download_dict):
   lemma_examples = lemma.lemma_nkjp_examples.order_by('source__priority', 
                                                       'opinion__priority', 
                                                       'sentence').all()
@@ -95,10 +94,10 @@ def lemma_tex(lemma, loop_counter, q_frame_opinions, sort_reflex_vals,
   frames = []
   if q_frame_opinions:
     frame_opinions = lemma.frame_opinions.filter(reduce(operator.or_, q_frame_opinions))
-  for reflex_val in sort_reflex_vals:
-    for neg_val in sort_neg_vals:
-        for pred_val in sort_pred_vals:
-            for aspect_val in sort_aspect_vals:
+  for reflex_val in lemma.get_existing_frame_char_values(u'ZWROTNOŚĆ'):
+    for neg_val in lemma.get_existing_frame_char_values(u'NEGATYWNOŚĆ'):
+        for pred_val in lemma.get_existing_frame_char_values(u'PREDYKATYWNOŚĆ'):
+            for aspect_val in lemma.get_existing_frame_char_values(u'ASPEKT'):
               matching_frames = lemma.get_frames_by_char_values(reflex_val=reflex_val, 
                                                                 neg_val=neg_val, 
                                                                 pred_val=pred_val,