Worklist.py: improve function getVarMatch.

product/ERP5Workflow/Document/Worklist.py

@@ -131,7 +131,7 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
 
     def getVarMatch(self, id):
         """ return value of matched keys"""
-        #self.var_matches = {}
+        self.var_matches = {}
         matches = None
         matches_ref_list = []
         if id == 'portal_type':
@@ -141,31 +141,27 @@ class Worklist(IdAsReferenceMixin("worklist_", "prefix"), XMLObject):
           else:
             v = [ var.strip() for var in self.matched_portal_type ]
             matches = tuple(v)
-        elif id == 'validation_state':
-          matches_id_list = self.getMatchedValidationStateList()
-          for state_id in matches_id_list:
-            matches_ref_list.append(self.getParent()._getOb(state_id).getReference())
-          matches = tuple(matches_ref_list)
-        elif id == 'simulation_state':
-          matches_id_list = self.getMatchedSimulationStateList()
+
+        if id in ['validation_state', 'simulation_state']:
+          if id == 'validation_state':
+            matches_id_list = self.getMatchedValidationStateList()
+          elif id == 'simulation_state':
+            matches_id_list = self.getMatchedSimulationStateList()
           for state_id in matches_id_list:
             matches_ref_list.append(self.getParent()._getOb(state_id).getReference())
-          matches = tuple(matches_ref_list)
-        elif id == 'causality_state':
+          matches = matches_ref_list
+
+        if id == 'causality_state':
           matches_id = self.getMatchedCausalityState()
           if matches_id is None:
             matches_id = ''
           matches_ref_list.append(matches_id)
-          matches = tuple(matches_ref_list)
-        else:
-          raise NotImplementedError ("Cataloged variable '%s' matching error in Worklist.py"%id)
+          matches = matches_ref_list
+
         if matches is not None:
-          """
           if not isinstance(matches, (tuple, Expression)):
             # Old version, convert it.
             matches = (matches,)
-            self.var_matches[id] = str(matches)
-          """
           return matches
         else:
           return ()