diff --git a/semantics/views.py b/semantics/views.py index d2b2357..1061343 100644 --- a/semantics/views.py +++ b/semantics/views.py @@ -77,7 +77,7 @@ def reorder_history(frames_list): def ajax_frames(request, lemma_id): lemma = Lemma.objects.get(id=lemma_id, old=False) - lexical_units = LexicalUnit.objects.filter(Q(base = lemma.entry)|Q(base = lemma.entry + u' się')).order_by('sense') + lexical_units = LexicalUnit.objects.filter(Q(base__startswith=lemma.entry + u' ')|Q(base__contains=u' '+lemma.entry+u' ')|Q(base__endswith=u' '+lemma.entry)|Q(base=lemma.entry)).order_by('sense') alternations = {} frames_dict = {} @@ -97,7 +97,8 @@ def ajax_frames(request, lemma_id): if t not in type_frames: type_frames[t] = [] type_frames[tuple(frame_units[frame_id])].append(frames_dict[frame_id]) - + +# ala[ma]=kot frames_display = [] complement_arguments = {} @@ -209,7 +210,8 @@ def ajax_frames(request, lemma_id): @ajax(method='get', encode_result=False) def ajax_units(request, lemma_id): lemma = Lemma.objects.get(id=lemma_id, old=False) - lexical_units = LexicalUnit.objects.filter(Q(base = lemma.entry, pos="czasownik")|Q(base = lemma.entry + u' się', pos="czasownik")).order_by('base', 'sense') +# lexical_units = LexicalUnit.objects.filter(Q(base = lemma.entry, pos="czasownik")|Q(base = lemma.entry + u' się', pos="czasownik")).order_by('base', 'sense') + lexical_units = LexicalUnit.objects.filter(Q(base__startswith=lemma.entry + u' ', pos="czasownik")|Q(base__contains=u' '+lemma.entry+u' ', pos="czasownik")|Q(base__endswith=u' '+lemma.entry, pos="czasownik")|Q(base=lemma.entry, pos="czasownik")).order_by('base', 'sense') context = { 'lexical_units': [{"id": lu.id, "luid": lu.luid, "base": lu.base, "sense": lu.sense, "pos": lu.pos, "glossa": lu.glossa, "definition": lu.definition} for lu in lexical_units],