Commit 287c3ae4 authored by wenjie.zheng's avatar wenjie.zheng

Worklist.py: fix some data structure issues.

parent a4e398c4
...@@ -190,6 +190,7 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject): ...@@ -190,6 +190,7 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
for state_id in matches_id_list: for state_id in matches_id_list:
if hasattr(self.getParent(), state_id): if hasattr(self.getParent(), state_id):
matches_ref_list.append(self.getParent()._getOb(state_id).getReference()) matches_ref_list.append(self.getParent()._getOb(state_id).getReference())
else: matches_ref_list = matches_id_list
matches = tuple(matches_ref_list) matches = tuple(matches_ref_list)
elif id == 'causality_state': elif id == 'causality_state':
matches_id = self.getMatchedCausalityState() matches_id = self.getMatchedCausalityState()
...@@ -199,7 +200,7 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject): ...@@ -199,7 +200,7 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
# Local dynamic variable: # Local dynamic variable:
dynamic_varible = self._getOb('variable_'+id) dynamic_varible = self._getOb('variable_'+id)
if dynamic_varible.getInitialValue(): if dynamic_varible.getInitialValue():
matches = dynamic_varible.getInitialValue() matches = [dynamic_varible.getInitialValue()]
# Override initial value if expression set: # Override initial value if expression set:
if dynamic_varible.getDefaultExpr(): if dynamic_varible.getDefaultExpr():
matches = Expression(dynamic_varible.getDefaultExpr()) matches = Expression(dynamic_varible.getDefaultExpr())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment