Reconnecting semantics bugfixes.

Bartłomiej Nitoń
1 parent ac9edb28
Showing 3 changed files with 11 additions and 4 deletions
common/js_to_obj.py
dictionary/saving.py
dictionary/static/js/semantics_coupling.js
@@ -44,7 +44,6 @@ def jsFrameToObj(frame, lemma_entry):
       if len(position['arguments']) > 0:
           pos_obj = jsPosToObj(position)
           positions_objs.append(pos_obj)
-          position['id'] = pos_obj.id
  
     sorted_positions = []  
     sorted_pos_dict = sortPositions(positions_objs)
@@ -20,9 +20,9 @@ def get_semantic_operations(lemma, schemata_conversions):
  
 def get_reconnect_operations_and_extend_connections(connections, schema, js_schema):
     operations = []
+    used_poss_ids = [] 
     for js_position in js_schema['positions']:
-        #position = jsPosToObj(js_position)
-        position = schema.positions.get(id=js_position['id'])
+        position = get_position(schema, js_position, used_poss_ids)
         for js_phrase_type in js_position['arguments']:
             phrase_type = Argument.objects.get(id=js_phrase_type['id'])
             new_connection_target = {'schema': schema,
@@ -39,6 +39,14 @@ def get_reconnect_operations_and_extend_connections(connections, schema, js_sche
                                         'realizations': conn['realizations']})
     return operations
  
+def get_position(schema, js_position, used_poss_ids):
+    position = jsPosToObj(js_position)
+    same_poss = schema.positions.filter(text_rep=position.text_rep)
+    unused_same_poss = same_poss.exclude(id__in=used_poss_ids)
+    position = unused_same_poss[0]
+    used_poss_ids.append(position.id)
+    return position
+
 def reconnect_operations(connection, new_target):
     operations = []
     compl = Complement.objects.get(id=connection['compl'])
@@ -91,5 +91,5 @@ function clearPositionConnections(position) {
 }
  
 function clearPhraseTypeConnections(phraseType) {
-	phraseType.complements = [];
+	phraseType.connections = [];
 }