Commit 998a9b2c718572c119b22b7b96496624ebd5b846
1 parent
ac1f9de7
phrase desc fix (removed resolving str case based on control, which was wrong)
Showing
1 changed file
with
8 additions
and
8 deletions
entries/phrase_descriptions/descriptions.py
... | ... | @@ -270,8 +270,8 @@ def make_phraseologisms(phrase, function, negativity, attrs={}, controller=None, |
270 | 270 | case = attrs['case'] if 'case' in attrs else 'nom' |
271 | 271 | POS = lambda lemma: correct_pos(lemma, 'subst') |
272 | 272 | NUM = lambda lemma: correct_num(lemma, phrase._number) |
273 | - if not function and controller and controller._function and controller._function._value: | |
274 | - function = controller._function._value | |
273 | + #if not function and controller and controller._function and controller._function._value: | |
274 | + # function = controller._function._value | |
275 | 275 | CASE = correct_case(case, function, negativity) |
276 | 276 | if case == 'str' and not function: |
277 | 277 | logging.warning('{}: couldn’t resolve str case in {}; assuming {}'.format(get_current_entry()._base, phrase, CASE)) |
... | ... | @@ -347,9 +347,9 @@ def make_phraseologisms(phrase, function, negativity, attrs={}, controller=None, |
347 | 347 | # np. uczynić coś *jakimś* / kobietę *jakąś* |
348 | 348 | # w składni nie będzie controller_grammar |
349 | 349 | #TODO test? (***) |
350 | - if not function and controller and controller_grammar: | |
351 | - function = controller._function._value if controller._function else None | |
352 | - control = True | |
350 | + #if not function and controller and controller_grammar: | |
351 | + # function = controller._function._value if controller._function else None | |
352 | + # control = True | |
353 | 353 | if ptype == LexAdjP: |
354 | 354 | phrase2 = phrase._adjp |
355 | 355 | POS = lambda lemma: correct_pos(lemma, 'adj') |
... | ... | @@ -371,9 +371,9 @@ def make_phraseologisms(phrase, function, negativity, attrs={}, controller=None, |
371 | 371 | # np. uczynić coś *jakimś* / kobietę *jakąś* |
372 | 372 | # w składni nie będzie controller_grammar |
373 | 373 | #TODO test? (***) |
374 | - #if controller and controller_grammar: | |
375 | - # function = controller._function._value if controller._function else None | |
376 | - # control = True | |
374 | + if controller and controller_grammar: | |
375 | + function = controller._function._value if controller._function else None | |
376 | + control = True | |
377 | 377 | if phrase._number == 'agr' and 'num' in attrs: |
378 | 378 | num = attrs['num'] |
379 | 379 | assert (num != 'agr') |
... | ... |