Commit 8089d5e69a63da1ab8e12f0d6855af2a96a736ea

Authored by Tomasz Bartosiak
1 parent 4194ac23

multiple subjecs in phraseology, phraseologic verbs in plural

semantics/phraseology_generator.py
@@ -157,7 +157,7 @@ def get_verb(inf, number, is_subj): @@ -157,7 +157,7 @@ def get_verb(inf, number, is_subj):
157 filtered = [] 157 filtered = []
158 for option in options: 158 for option in options:
159 (orth, tag) = option 159 (orth, tag) = option
160 - if u'fin:' in tag and u':sg:' in tag and u':ter:' in tag: 160 + if u'fin:' in tag and u':' + number + ':' in tag and u':ter:' in tag:
161 filtered.append(option) 161 filtered.append(option)
162 options = filtered 162 options = filtered
163 return [orth for orth, _ in options] 163 return [orth for orth, _ in options]
semantics/static/js/semantics_lexical_units.js
@@ -230,7 +230,7 @@ function getMeaningsSelectionForFrame(frame_id) { @@ -230,7 +230,7 @@ function getMeaningsSelectionForFrame(frame_id) {
230 if (connected[lem].indexOf(proper) != -1) { 230 if (connected[lem].indexOf(proper) != -1) {
231 if (schemas_content[sch].display.arguments[0][k].vrb != null && 231 if (schemas_content[sch].display.arguments[0][k].vrb != null &&
232 schemas_content[sch].display.arguments[0][k].vrb.length > 0) { 232 schemas_content[sch].display.arguments[0][k].vrb.length > 0) {
233 - pre.push(schemas_content[sch].display.arguments[0][k].lex); 233 + pre = pre.concat(schemas_content[sch].display.arguments[0][k].lex);
234 vrb = schemas_content[sch].display.arguments[0][k].vrb; 234 vrb = schemas_content[sch].display.arguments[0][k].vrb;
235 } else { 235 } else {
236 options.push(schemas_content[sch].display.arguments[0][k].lex); 236 options.push(schemas_content[sch].display.arguments[0][k].lex);