diff --git a/.environment-dev b/.environment-dev
index 99f45b908c1752d6b12c3c55a1b0a595582e4d78..28431a5a1a0e19a984542c4be1f93bf936736c4b 100644
--- a/.environment-dev
+++ b/.environment-dev
@@ -14,6 +14,8 @@ EMAIL_USE_TLS=false
EMAIL_USE_SSL=false
SECRET_KEY=Ixosoh1iemoh0Heloh1thee5akooboonu5veehae4aikoh2ohg
UWSGI_PROCESS_PER_CONTAINER=4
-SERVER_HOST_NAME=valunifier.ipipan.waw.pl
-#SERVER_HOST_NAME=localhost
-UNIFIED_FRAME_SERVICE_URL=http://walentygroupies.ipipan.waw.pl/ajax/clusterer/?unifier_frame_id=
+#SERVER_HOST_NAME=valunifier.ipipan.waw.pl
+SERVER_HOST_NAME=localhost
+#UNIFIED_FRAME_SERVICE_URL=http://walentygroupies.ipipan.waw.pl/ajax/clusterer/?unifier_frame_id=
+PHRASE_TYPES_EXPAND_FILE_NAME=phrase_types_expand_20210913.xml
+WALENTY_FILE_NAME=walenty_20210913_smaller.xml
diff --git a/README.md b/README.md
index 44db7df9ef1e2df3d9c5fe4ed236f45ed38691fd..b3ccd15a4f674ee1cee585c21f7bd8b18edf8979 100644
--- a/README.md
+++ b/README.md
@@ -25,7 +25,7 @@ To load different dictionary file one have to run following tasks before executi
* download full Walenty dataset (TEI format can by downlowaded from http://zil.ipipan.waw.pl/Walenty)
* unpack zip archive and place xml file in ./data/walenty
- * set environment variable WALENTY_FILE_NAME to the name of file (e.g. export WALENTY_FILE_NAME=walenty_20210913.xml)
+ * set environment variables WALENTY_FILE_NAME and PHRASE_TYPES_EXPAND_FILE_NAME to the name of files that will be loaded (e.g. export WALENTY_FILE_NAME=walenty_20210913.xml, export PHRASE_TYPES_EXPAND_FILE_NAME=phrase_types_expand_20210913.xml)
In order to reinstall a database instance a folder specified by the DATABASE_DIR should be removed.
diff --git a/phrase_expansions/management/commands/import_expansions.py b/phrase_expansions/management/commands/import_expansions.py
index 5175a3293dc81c1dce574522099e41dd38055b9e..9af36352fe93dda698d9d0b768bf0149199ae787 100644
--- a/phrase_expansions/management/commands/import_expansions.py
+++ b/phrase_expansions/management/commands/import_expansions.py
@@ -28,7 +28,8 @@ OPINION_MAP = {
}
def import_expansions():
- xml_file = os.path.join(BASE_DIR, 'data', 'walenty', 'phrase_types_expand_20230626.xml')#phrase_types_expand_20210913.xml')
+ xml_file_name = os.getenv('PHRASE_TYPES_EXPAND_FILE_NAME', default='phrase_types_expand_20210913.xml')
+ xml_file = os.path.join(BASE_DIR, 'data', 'walenty', xml_file_name)
xml_path = os.path.join(os.path.dirname(os.path.abspath(__file__)), xml_file)
parser = make_parser()
diff --git a/unifier/views.py b/unifier/views.py
index 0a1114b77f16030d3d1f665f78291d017722f764..f9ca63772de0451380067e0460a9a24ec56fa4a3 100644
--- a/unifier/views.py
+++ b/unifier/views.py
@@ -42,11 +42,11 @@ def save_synset_preference(request):
complement_id = request.POST['complement_id']
synset_preference_id = request.POST['synset_preference_id']
- unifiedFrameArgument = UnifiedFrameArgument.objects.get(unified_frame_id=int(frame_id), id=int(complement_id))
- unifiedFrameArgument.synsets.add(int(synset_preference_id))
- unifiedFrameArgument.save()
+ unified_frame_argument = UnifiedFrameArgument.objects.get(unified_frame_id=int(frame_id), id=int(complement_id))
+ unified_frame_argument.synsets.add(int(synset_preference_id))
+ unified_frame_argument.save()
- updateArgumentPreferencesCount(unifiedFrameArgument)
+ update_argument_preferences_count(unified_frame_argument)
return JsonResponse({})
@@ -59,11 +59,11 @@ def save_predefined_preference(request):
complement_id = request.POST['complement_id']
predefined_preference_id = request.POST['predefined_preference_id']
- unifiedFrameArgument = UnifiedFrameArgument.objects.get(unified_frame_id=int(frame_id), id=int(complement_id))
- unifiedFrameArgument.predefined.add(int(predefined_preference_id))
- unifiedFrameArgument.save()
+ unified_frame_argument = UnifiedFrameArgument.objects.get(unified_frame_id=int(frame_id), id=int(complement_id))
+ unified_frame_argument.predefined.add(int(predefined_preference_id))
+ unified_frame_argument.save()
- updateArgumentPreferencesCount(unifiedFrameArgument)
+ update_argument_preferences_count(unified_frame_argument)
return JsonResponse({})
@@ -77,15 +77,15 @@ def save_relational_selectional_preference(request):
complement_id_to = request.POST['complement_id_to']
relation_id = request.POST['relation_id']
- unifiedFrameArgument = UnifiedFrameArgument.objects.get(unified_frame_id=int(frame_id),
- id=int(complement_id_from))
- relationalSelectionalPreference = UnifiedRelationalSelectionalPreference(to_id=complement_id_to,
- relation_id=relation_id)
- relationalSelectionalPreference.save()
- unifiedFrameArgument.relations.add(relationalSelectionalPreference)
- unifiedFrameArgument.save()
+ unified_frame_argument = UnifiedFrameArgument.objects.get(unified_frame_id=int(frame_id),
+ id=int(complement_id_from))
+ relational_selectional_preference = UnifiedRelationalSelectionalPreference(to_id=complement_id_to,
+ relation_id=relation_id)
+ relational_selectional_preference.save()
+ unified_frame_argument.relations.add(relational_selectional_preference)
+ unified_frame_argument.save()
- updateArgumentPreferencesCount(unifiedFrameArgument)
+ update_argument_preferences_count(unified_frame_argument)
return JsonResponse({})
@@ -131,24 +131,24 @@ def get_unified_frames(request):
'hierarchy_exists': unifiedFrame.hasHierarchyElems,
}
- resProcessed = []
+ res_processed = []
for key, value in res.items():
if (exclude_status is None or value['status'] != exclude_status) and \
(restrict_to_user is None or value['assignee_username'] == restrict_to_user):
- resProcessed.append(value)
+ res_processed.append(value)
ret = {
'draw': scroller_params['draw'],
- 'recordsTotal': len(resProcessed),
- 'recordsFiltered': len(resProcessed),
- 'data': resProcessed
+ 'recordsTotal': len(res_processed),
+ 'recordsFiltered': len(res_processed),
+ 'data': res_processed
}
return JsonResponse(ret)
return JsonResponse({})
-def unifiedFrame2dict(frame):
+def unified_frame_2_dict(frame):
return {
'id': frame.id,
'title': frame.title,
@@ -198,13 +198,13 @@ def get_examples(frames):
frame_ids, argument_ids, lu_ids = set(), set(), set()
schema_ids, phrases, phrases_syntax = set(), set(), set()
positions = set()
- for connection in example.example_connections.all():
- for argument in connection.arguments.all():
- frame_ids.add(argument.frame.id)
- argument_ids.add('{}-{}'.format(argument.frame.id, argument.id))
- if connection.lexical_unit:
- lu_ids.add(connection.lexical_unit.id)
- for hook in connection.schema_connections.all():
+ for example_connection in example.example_connections.all():
+ for conn_argument in example_connection.arguments.all():
+ frame_ids.add(conn_argument.frame.id)
+ argument_ids.add('{}-{}'.format(conn_argument.frame.id, conn_argument.id))
+ if example_connection.lexical_unit:
+ lu_ids.add(example_connection.lexical_unit.id)
+ for hook in example_connection.schema_connections.all():
schema_ids.add(hook.schema.id)
phrases.add('{}-{}-{}-{}'.format(hook.schema.id, hook.position.id, hook.phrase_type.id,
hook.alternation - 1))
@@ -267,9 +267,9 @@ def get_unified_frame_json(unified_frame, request):
'schemata': all_schema_objects_dict
}]
- unifiedFrame_dict = unifiedFrame2dict(unified_frame)
+ unified_frame_dict = unified_frame_2_dict(unified_frame)
- return {'unified_frame_id': unified_frame.id, 'unified_frame': unifiedFrame_dict, 'subentries': subentries,
+ return {'unified_frame_id': unified_frame.id, 'unified_frame': unified_frame_dict, 'subentries': subentries,
'frames': slowal_frames_dict, 'alternations': alternations, 'realisation_phrases': realisation_phrases,
'realisation_descriptions': realisation_descriptions, 'examples': examples,
'last_visited': request.session['last_visited']}
@@ -325,13 +325,13 @@ def remove_selectional_preference(request):
unified_frame_argument.relations.set(unified_frame_argument.relations.exclude(id__in=preference_ids))
unified_frame_argument.save()
- updateArgumentPreferencesCount(unified_frame_argument)
+ update_argument_preferences_count(unified_frame_argument)
return JsonResponse({})
return JsonResponse({})
-def updateArgumentPreferencesCount(unified_frame_argument):
+def update_argument_preferences_count(unified_frame_argument):
unified_frame_argument.preferences_count = unified_frame_argument.predefined.count() + \
unified_frame_argument.synsets.count() + \
unified_frame_argument.relations.count()
@@ -359,33 +359,33 @@ def change_slowal2unified_fram_argument_mapping(request):
slowal_frame_id = request.POST['slowal_frame_id']
slowal_frame_selected_arguments = json.loads(request.POST['slowal_frame_selected_arguments'])
- unifiedFrame2SlowalFrameMapping = UnifiedFrame2SlowalFrameMapping.objects.get(unified_frame_id=unified_frame_id,
- slowal_frame=slowal_frame_id)
+ unified_frame2_slowal_frame_mapping = UnifiedFrame2SlowalFrameMapping.objects.get(
+ unified_frame_id=unified_frame_id, slowal_frame=slowal_frame_id)
arg1_id = int(slowal_frame_selected_arguments[0])
arg2_id = int(slowal_frame_selected_arguments[1])
- unifiedFrameArgumentMapping1 = UnifiedFrameArgumentSlowalFrameMapping.objects.get(
- unified_frame_mapping=unifiedFrame2SlowalFrameMapping,
+ unified_frame_argument_mapping1 = UnifiedFrameArgumentSlowalFrameMapping.objects.get(
+ unified_frame_mapping=unified_frame2_slowal_frame_mapping,
slowal_agrument_id=arg1_id) if arg1_id >= 0 else None
- unifiedFrameArgumentMapping2 = UnifiedFrameArgumentSlowalFrameMapping.objects.get(
- unified_frame_mapping=unifiedFrame2SlowalFrameMapping,
+ unified_frame_argument_mapping2 = UnifiedFrameArgumentSlowalFrameMapping.objects.get(
+ unified_frame_mapping=unified_frame2_slowal_frame_mapping,
slowal_agrument_id=arg2_id) if arg2_id >= 0 else None
- if unifiedFrameArgumentMapping1 is not None and unifiedFrameArgumentMapping2 is not None:
+ if unified_frame_argument_mapping1 is not None and unified_frame_argument_mapping2 is not None:
# mamy oba argumenty, zamieniamy miescami
- unifiedFrameArgumentMapping1.slowal_agrument_id = arg2_id
- unifiedFrameArgumentMapping2.slowal_agrument_id = arg1_id
- unifiedFrameArgumentMapping1.save()
- unifiedFrameArgumentMapping2.save()
- elif unifiedFrameArgumentMapping1 is not None and unifiedFrameArgumentMapping2 is None:
+ unified_frame_argument_mapping1.slowal_agrument_id = arg2_id
+ unified_frame_argument_mapping2.slowal_agrument_id = arg1_id
+ unified_frame_argument_mapping1.save()
+ unified_frame_argument_mapping2.save()
+ elif unified_frame_argument_mapping1 is not None and unified_frame_argument_mapping2 is None:
# mamy lewy argument, prawy jest Empty
- unifiedFrameArgumentMapping1.unified_agrument_id = -arg2_id
- unifiedFrameArgumentMapping1.save()
- elif unifiedFrameArgumentMapping1 is None and unifiedFrameArgumentMapping2 is not None:
+ unified_frame_argument_mapping1.unified_agrument_id = -arg2_id
+ unified_frame_argument_mapping1.save()
+ elif unified_frame_argument_mapping1 is None and unified_frame_argument_mapping2 is not None:
# mamy prawy argument, lewy jest Empty
- unifiedFrameArgumentMapping2.unified_agrument_id = -arg1_id
- unifiedFrameArgumentMapping2.save()
+ unified_frame_argument_mapping2.unified_agrument_id = -arg1_id
+ unified_frame_argument_mapping2.save()
return JsonResponse({})
return JsonResponse({})
@@ -413,11 +413,11 @@ def save_unified_frame_title(request):
unified_frame_id = request.POST['unified_frame_id']
unified_frame_title = request.POST['unified_frame_title']
- unifiedFrame = UnifiedFrame.objects.get(id=unified_frame_id)
+ unified_frame = UnifiedFrame.objects.get(id=unified_frame_id)
- if unifiedFrame:
- unifiedFrame.title = unified_frame_title
- unifiedFrame.save()
+ if unified_frame:
+ unified_frame.title = unified_frame_title
+ unified_frame.save()
return JsonResponse({})
@@ -429,10 +429,10 @@ def save_selected_role(request):
complement_id = request.POST['complement_id']
role_id = request.POST['role_id']
- unifiedFrameArgument = UnifiedFrameArgument.objects.get(unified_frame_id=int(unified_frame_id),
- id=int(complement_id))
- unifiedFrameArgument.role_id = role_id
- unifiedFrameArgument.save()
+ unified_frame_argument = UnifiedFrameArgument.objects.get(unified_frame_id=int(unified_frame_id),
+ id=int(complement_id))
+ unified_frame_argument.role_id = role_id
+ unified_frame_argument.save()
return JsonResponse({})
@@ -446,16 +446,16 @@ def save_new_role(request):
role_type = request.POST['role_type']
attribute_id = request.POST.get('attribute_id', None)
- argumentRole = ArgumentRole.objects.filter(role_id=role_id, attribute_id=attribute_id).first()
- if argumentRole is None:
- argumentRole = ArgumentRole(role=SemanticRole.objects.get(pk=role_id),
- attribute=RoleAttribute.objects.get(pk=attribute_id))
- argumentRole.save()
+ argument_role = ArgumentRole.objects.filter(role_id=role_id, attribute_id=attribute_id).first()
+ if argument_role is None:
+ argument_role = ArgumentRole(role=SemanticRole.objects.get(pk=role_id),
+ attribute=RoleAttribute.objects.get(pk=attribute_id))
+ argument_role.save()
- unifiedFrameArgument = UnifiedFrameArgument.objects.get(unified_frame_id=unified_frame_id, id=complement_id)
- unifiedFrameArgument.role = argumentRole
- unifiedFrameArgument.role_type = RoleType.objects.get(type=role_type)
- unifiedFrameArgument.save()
+ unified_frame_argument = UnifiedFrameArgument.objects.get(unified_frame_id=unified_frame_id, id=complement_id)
+ unified_frame_argument.role = argument_role
+ unified_frame_argument.role_type = RoleType.objects.get(type=role_type)
+ unified_frame_argument.save()
return JsonResponse({})
@@ -465,11 +465,11 @@ def add_argument(request):
if request.method == 'POST':
unified_frame_id = request.POST['unified_frame_id']
- unifiedFrame = UnifiedFrame.objects.get(pk=unified_frame_id)
- newUnifiedFrameArgument = UnifiedFrameArgument.objects.create(unified_frame=unifiedFrame)
- newUnifiedFrameArgument.save()
- unifiedFrame.arguments_count = unifiedFrame.arguments_count + 1
- unifiedFrame.save()
+ unified_frame = UnifiedFrame.objects.get(pk=unified_frame_id)
+ new_unified_frame_argument = UnifiedFrameArgument.objects.create(unified_frame=unified_frame)
+ new_unified_frame_argument.save()
+ unified_frame.arguments_count = unified_frame.arguments_count + 1
+ unified_frame.save()
return JsonResponse({})
@@ -480,11 +480,11 @@ def remove_argument(request):
unified_frame_id = request.POST['unified_frame_id']
complement_id = request.POST['complement_id']
- newUnifiedFrameArgument = UnifiedFrameArgument.objects.get(id=complement_id)
- newUnifiedFrameArgument.delete()
- unifiedFrame = UnifiedFrame.objects.get(pk=unified_frame_id)
- unifiedFrame.arguments_count = unifiedFrame.arguments_count - 1
- unifiedFrame.save()
+ new_unified_frame_argument = UnifiedFrameArgument.objects.get(id=complement_id)
+ new_unified_frame_argument.delete()
+ unified_frame = UnifiedFrame.objects.get(pk=unified_frame_id)
+ unified_frame.arguments_count = unified_frame.arguments_count - 1
+ unified_frame.save()
return JsonResponse({})
@@ -493,14 +493,14 @@ def remove_argument(request):
def change_unified_frame_status_to_ready(request):
if request.method == 'POST':
unified_frame_id = request.POST['unified_frame_id']
- unifiedFrame = UnifiedFrame.objects.get(pk=unified_frame_id)
- unifiedFrame.status = choices.UnifiedFrameStatus.READY
+ unified_frame = UnifiedFrame.objects.get(pk=unified_frame_id)
+ unified_frame.status = choices.UnifiedFrameStatus.READY
- for mapping in unifiedFrame.unified_frame_2_slowal_frame.all():
+ for mapping in unified_frame.unified_frame_2_slowal_frame.all():
mapping.verified = True
mapping.save()
- unifiedFrame.save()
+ unified_frame.save()
return JsonResponse({})
@@ -509,23 +509,23 @@ def change_unified_frame_status_to_ready(request):
def change_unified_frame_status_to_verified_by_superleksykograf(request):
if request.method == 'POST':
unified_frame_id = request.POST['unified_frame_id']
- unifiedFrame = UnifiedFrame.objects.get(pk=unified_frame_id)
- unifiedFrame.status = choices.UnifiedFrameStatus.VERIFIED
+ unified_frame = UnifiedFrame.objects.get(pk=unified_frame_id)
+ unified_frame.status = choices.UnifiedFrameStatus.VERIFIED
# save fin statement info for current active fin statement
fin_statements = FinStatement.objects.filter(is_active=True)
if fin_statements.count() == 1:
active_fin_statement = fin_statements[0]
- unifiedFrame.fin_statement = active_fin_statement
+ unified_frame.fin_statement = active_fin_statement
- unifiedFrame.save()
+ unified_frame.save()
return JsonResponse({})
@csrf_exempt
def create_unified_frame(frame_id):
-
- logging.info('Requesting unified frame creation service, frame_id: {}, service_url: {}'.format(frame_id, settings.UNIFIED_FRAME_SERVICE_URL ))
+ logging.info('Requesting unified frame creation service, frame_id: {}, service_url: {}'
+ .format(frame_id, settings.UNIFIED_FRAME_SERVICE_URL))
http = urllib3.PoolManager()
@@ -536,14 +536,14 @@ def create_unified_frame(frame_id):
parser = make_parser()
parser.setFeature(handler.feature_external_ges, False)
- unifiedFrameXMLHandler = UnificationPreprocessHandler()
- parser.setContentHandler(unifiedFrameXMLHandler)
+ unified_frame_xml_handler = UnificationPreprocessHandler()
+ parser.setContentHandler(unified_frame_xml_handler)
f = io.StringIO(response)
parser.parse(f)
- unified_frame_id = unifiedFrameXMLHandler.unified_frame_ids[0]
+ unified_frame_id = unified_frame_xml_handler.unified_frame_ids[0]
return unified_frame_id
@@ -556,31 +556,31 @@ def build_unified_frame_xml(request):
lu = LexicalUnit.objects.get(pk=lu_id)
frames = list(lu.frames.all())
if len(frames) > 0:
- matchingElem = Element('matching')
- unifier_frameElem = SubElement(matchingElem, 'unifier_frame')
+ matching_elem = Element('matching')
+ unifier_frame_elem = SubElement(matching_elem, 'unifier_frame')
frame = frames[0]
arguments = list(frame.arguments.all())
- argCnt = len(arguments)
- for id in range(argCnt):
- argumentElem = SubElement(unifier_frameElem, 'argument', attrib={'id': str(id)})
- semantic_role_typeElem = SubElement(argumentElem, 'semantic_role', attrib={'type': 'role'})
- rolesElem = SubElement(argumentElem, 'roles')
- roleElem1 = SubElement(rolesElem, 'role', attrib={'name': 'Initiator'})
- roleElem2 = SubElement(rolesElem, 'role', attrib={'name': 'Manner'})
+ arg_cnt = len(arguments)
+ for id in range(arg_cnt):
+ argument_elem = SubElement(unifier_frame_elem, 'argument', attrib={'id': str(id)})
+ semantic_role_type_elem = SubElement(argument_elem, 'semantic_role', attrib={'type': 'role'})
+ roles_elem = SubElement(argument_elem, 'roles')
+ role_elem1 = SubElement(roles_elem, 'role', attrib={'name': 'Initiator'})
+ role_elem2 = SubElement(roles_elem, 'role', attrib={'name': 'Manner'})
- connectionsElem = SubElement(unifier_frameElem, 'connections')
+ connections_elem = SubElement(unifier_frame_elem, 'connections')
- slowal_frameElem = SubElement(connectionsElem, 'slowal_frame', attrib={'id': str(frame.id)})
+ slowal_frame_elem = SubElement(connections_elem, 'slowal_frame', attrib={'id': str(frame.id)})
- arguments_connectionsElem = SubElement(slowal_frameElem, 'argument_connections')
+ arguments_connections_elem = SubElement(slowal_frame_elem, 'argument_connections')
for id, argument in enumerate(arguments):
- arguments_connectionElem = SubElement(arguments_connectionsElem, 'argument_connection',
- attrib={'unifier_argument_id': str(id),
- 'slowal_id': str(argument.id)})
- xml = tostring(matchingElem)
+ arguments_connection_elem = SubElement(arguments_connections_elem, 'argument_connection',
+ attrib={'unifier_argument_id': str(id),
+ 'slowal_id': str(argument.id)})
+ xml = tostring(matching_elem)
return HttpResponse(xml)
return HttpResponse()
@@ -593,11 +593,11 @@ def save_unified_frame_title(request):
unified_frame_id = request.POST['unified_frame_id']
unified_frame_title = request.POST['unified_frame_title']
- unifiedFrame = UnifiedFrame.objects.get(id=unified_frame_id)
+ unified_frame = UnifiedFrame.objects.get(id=unified_frame_id)
- if unifiedFrame:
- unifiedFrame.title = unified_frame_title
- unifiedFrame.save()
+ if unified_frame:
+ unified_frame.title = unified_frame_title
+ unified_frame.save()
return JsonResponse({})
@@ -612,16 +612,16 @@ def frame_assign(request):
unified_frame_pk = create_unified_frame(frame_id)
- unifiedFrame = get_object_or_404(
+ unified_frame = get_object_or_404(
UnifiedFrame.objects,
pk=unified_frame_pk,
)
- unifiedFrame.title = unified_frame_title
- unifiedFrame.save()
+ unified_frame.title = unified_frame_title
+ unified_frame.save()
- Assignment.assign(user=request.user, subject=unifiedFrame)
+ Assignment.assign(user=request.user, subject=unified_frame)
- slowal_frames = [connection.slowal_frame for connection in unifiedFrame.unified_frame_2_slowal_frame.all()]
+ slowal_frames = [connection.slowal_frame for connection in unified_frame.unified_frame_2_slowal_frame.all()]
for slowal_frame in slowal_frames:
slowal_frame.status = FrameStatus.PROCESSING
@@ -636,16 +636,17 @@ def frame_assign(request):
return JsonResponse({})
-def removeUnifiedFrameMappingsAndAssigments(unified_frame_id):
+def remove_unified_frame_mappings_and_assigments(unified_frame_id):
# odpianie z ramy zunifikowanej
- unifiedFrame2SlowalFrameMappings = UnifiedFrame2SlowalFrameMapping.objects.filter(unified_frame_id=unified_frame_id)
- for unifiedFrame2SlowalFrameMapping in unifiedFrame2SlowalFrameMappings:
+ unified_frame2_slowal_frame_mappings = UnifiedFrame2SlowalFrameMapping.objects.filter(
+ unified_frame_id=unified_frame_id)
+ for unifiedFrame2SlowalFrameMapping in unified_frame2_slowal_frame_mappings:
unifiedFrame2SlowalFrameMapping.slowal_frame.status = 'N'
unifiedFrame2SlowalFrameMapping.slowal_frame.save()
Assignment.delete(subject_id=unifiedFrame2SlowalFrameMapping.slowal_frame.id)
- unifiedFrameArgumentSlowalFrameMappings = UnifiedFrameArgumentSlowalFrameMapping.objects.filter(
+ unified_frame_argument_slowal_frame_mappings = UnifiedFrameArgumentSlowalFrameMapping.objects.filter(
unified_frame_mapping=unifiedFrame2SlowalFrameMapping)
- unifiedFrameArgumentSlowalFrameMappings.delete()
+ unified_frame_argument_slowal_frame_mappings.delete()
unifiedFrame2SlowalFrameMapping.delete()
Assignment.delete(subject_id=unified_frame_id)
@@ -653,7 +654,7 @@ def removeUnifiedFrameMappingsAndAssigments(unified_frame_id):
@ajax(login_required=True, method='post')
@transaction.atomic
def delete_unified_frame(request, unified_frame_id):
- removeUnifiedFrameMappingsAndAssigments(unified_frame_id)
+ remove_unified_frame_mappings_and_assigments(unified_frame_id)
UnifiedFrameArgument.objects.filter(unified_frame_id=unified_frame_id).delete()
UnifiedFrame.objects.get(id=unified_frame_id).delete()
@@ -686,14 +687,14 @@ def hierarchy_assign(request):
hierarchy.hyperonym_id = hyperonym_id
hierarchy.save()
- setHierarchyExistsInfo(hyponym_id)
- setHierarchyExistsInfo(hyperonym_id)
+ set_hierarchy_exists_info(hyponym_id)
+ set_hierarchy_exists_info(hyperonym_id)
return JsonResponse({'succ': 'true'})
return JsonResponse({})
-def setHierarchyExistsInfo(unified_fram_id):
+def set_hierarchy_exists_info(unified_fram_id):
unified_frame = UnifiedFrame.objects.get(pk=unified_fram_id)
unified_frame.hasHierarchyElems = True
unified_frame.save()
@@ -727,13 +728,13 @@ def hierarchy_unassign(request):
succ = True
# check if there is any heierarchy elements for unified frames from request
- setNoHierarchyExistsInfo(rel1_id)
- setNoHierarchyExistsInfo(rel2_id)
+ set_no_hierarchy_exists_info(rel1_id)
+ set_no_hierarchy_exists_info(rel2_id)
return JsonResponse({'succ': succ})
-def setNoHierarchyExistsInfo(unified_frame_id):
+def set_no_hierarchy_exists_info(unified_frame_id):
"""
Set unified frame field 'hasHierarchyElems' as false if needed.
:param unified_frame_id: Unified frame id