tricc-oo 1.4.13__tar.gz → 1.4.14__tar.gz

{tricc_oo-1.4.13 → tricc_oo-1.4.14}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.13
+Version: 1.4.14
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues

{tricc_oo-1.4.13 → tricc_oo-1.4.14}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "tricc-oo"
-version = "1.4.13"
+version = "1.4.14"
 description = "Python library that converts CDSS L2 in L3"
 readme = "README.md"
 license-files = ["LICENSE"]

{tricc_oo-1.4.13 → tricc_oo-1.4.14}/tricc_oo/strategies/input/drawio.py

@@ -43,7 +43,7 @@ class DrawioStrategy(BaseInputStrategy):
             calculates=calculates,
             recursive=False,
             codesystems=project.code_systems,
-            process=start_page.root.process
+            process=[start_page.root.process]
         )
 
         logger.info("# check if all edges (arrow) where used")

{tricc_oo-1.4.13 → tricc_oo-1.4.14}/tricc_oo/visitors/tricc.py

@@ -803,7 +803,10 @@ def walktrhough_tricc_node_processed_stached(node, callback, processed_nodes, st
             reorder_node_list(stashed_nodes, node.group, processed_nodes)
         if isinstance(node, (TriccNodeActivityStart, TriccNodeMainStart)):
             if getattr(node, 'process', None):
-                process = node.process
+                if process is None:
+                    process = [node.process]
+                else:
+                    process[0] = node.process
             if recursive:
                 for gp in node.activity.groups.values():
                     walktrhough_tricc_node_processed_stached(
@@ -849,7 +852,10 @@ def walktrhough_tricc_node_processed_stached(node, callback, processed_nodes, st
                 if node.root is not None:
                     node.root.path_len = max(path_len,  node.root.path_len)
                     if getattr(node.root, 'process', None):
-                        process = node.root.process
+                        if process is None:
+                            process = [node.root.process]
+                        else:
+                            process[0] = node.root.process
                     if recursive:
                         walktrhough_tricc_node_processed_stached(node.root, callback, processed_nodes, stashed_nodes, path_len,
                                                             recursive, warn = warn,node_path = node_path.copy(),**kwargs)
@@ -953,7 +959,7 @@ def get_data_for_log(node):
 def stashed_node_func(node, callback, recursive=False, **kwargs):
     processed_nodes = kwargs.pop('processed_nodes', OrderedSet())
     stashed_nodes = kwargs.pop('stashed_nodes', OrderedSet())
-    process = kwargs.pop('process', 'main')
+    process = kwargs.pop('process', ['main'])
     path_len = 0
     
     walktrhough_tricc_node_processed_stached(
@@ -1582,9 +1588,9 @@ def get_node_expression( in_node, processed_nodes, is_calculate=False, is_prev=F
             f_end_expression = get_end_expression(processed_nodes)
             if f_end_expression:
                 end_expressions.append(f_end_expression)
-            if process in PROCESSES:
-                for p in PROCESSES[PROCESSES.index(current_process)+1:]:
-                    p_end_expression = get_end_expression(processed_nodes, process)
+            if process[0] in PROCESSES:
+                for p in PROCESSES[PROCESSES.index(process[0])+1:]:
+                    p_end_expression = get_end_expression(processed_nodes, p)
                     if p_end_expression:
                         end_expressions.append(p_end_expression)
             if node.applicability:

{tricc_oo-1.4.13 → tricc_oo-1.4.14}/tricc_oo.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tricc-oo
-Version: 1.4.13
+Version: 1.4.14
 Summary: Python library that converts CDSS L2 in L3
 Project-URL: Homepage, https://github.com/SwissTPH/tricc
 Project-URL: Issues, https://github.com/SwissTPH/tricc/issues