Fix TGRL parsing

app.py

@@ -115,54 +115,31 @@ def extract_elements(tgrl_text):
 
   # get decomposed elements
 
-  new_lines = tgrl_text
+  new_tgrl_text = tgrl_text
   decomposed_elements = {}
 
-  main_elements = re.findall("\w+(?=\s+decomposedBy)", new_lines)
+  main_elements_1 = re.findall("\w+(?=\s+decomposedBy)", new_tgrl_text)
 
-  for main_element in main_elements:
-      
-      sub_elements = []
-      
-      sub_element = (re.findall(main_element+"(?: decomposedBy )([A-Za-z\s]*)", new_lines)[0])
-      sub_elements.append(sub_element)
-      new_lines = new_lines.replace(sub_element+', ', '')
-          
-      temp = main_element + " decomposedBy "
-      for idx, sub_element in enumerate(sub_elements):
-          if idx+1 == len (sub_elements):
-              temp = temp + sub_element + ";"
-          else:
-              temp = temp + sub_element + ", "
-      
-      while temp not in tgrl_text:
-          
-          sub_element = (re.findall(main_element+"(?: decomposedBy )([A-Za-z\s]*)", new_lines)[0])
-          sub_elements.append(sub_element)
-          new_lines = new_lines.replace(sub_element+', ', '')
-          
-          temp = main_element + " decomposedBy "
-          for idx, sub_element in enumerate(sub_elements):
-              if idx+1 == len (sub_elements):
-                  temp = temp + sub_element + ";"
-              else:
-                  temp = temp + sub_element + ", "
-
-      decomposed_elements[main_element] = sub_elements
-
-      # Replace elements IDs with names
-      new_decomposed_elements = {}
-
-      for key, _ in decomposed_elements.items():
-          
-          new_key = re.findall("(?:"+key+"\s*{\s*name\s=\s\")([A-Za-z\s;.,!?:-]*)", tgrl_text)[0]
-          new_values = []
-          
-          for element in decomposed_elements[key]:
-              new_value = re.findall("(?:"+element+"\s*{\s*name\s=\s\")([A-Za-z\s;.,!?:-]*)", tgrl_text)[0]
-              new_values.append(new_value)
-          
-          new_decomposed_elements[new_key] = new_values
+  for main_element in main_elements_1:
+      sub_element_1 = (re.findall(main_element+"\s*(?: decomposedBy )([A-Za-z\s]*)", new_tgrl_text)[0])
+      sub_element_1 = sub_element_1.replace(" ", "")
+      sub_element_2 = (re.findall(main_element+"\s*(?: decomposedBy )"+ sub_element_1 +",\s*([A-Za-z\s]*)", new_tgrl_text)[0])
+      new_tgrl_text = new_tgrl_text.replace(main_element+" decomposedBy "+sub_element_1+", "+sub_element_2+";", '')
+      decomposed_elements[main_element] = [sub_element_1, sub_element_2]
+
+  # Replace elements IDs with names
+  new_decomposed_elements = {}
+
+  for key, _ in decomposed_elements.items():
+
+      new_key = re.findall("(?:"+key+"\s*{\s*name\s=\s\")([A-Za-z\s]*)", tgrl_text)[0]
+      new_values = []
+
+      for element in decomposed_elements[key]:
+          new_value = re.findall("(?:"+element+"\s*{\s*name\s=\s\")([A-Za-z\s;.,!?:-]*)", tgrl_text)[0]
+          new_values.append(new_value)
+
+      new_decomposed_elements[new_key] = new_values
 
   return elements, elements_per_actor, new_decomposed_elements