From ef63d39a08cc889ebe6f6d9da8a4df4dd63515c1 Mon Sep 17 00:00:00 2001 From: Kazuhiko Shiozaki <kazuhiko@nexedi.com> Date: Wed, 10 Mar 2010 10:45:38 +0000 Subject: [PATCH] support updating solver decisions in buildSolverDecisionList(). git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@33573 20353a03-c40f-0410-a6d1-a30d3c3de9de --- product/ERP5/Document/SolverProcess.py | 30 +++++++++++++++++--------- 1 file changed, 20 insertions(+), 10 deletions(-) diff --git a/product/ERP5/Document/SolverProcess.py b/product/ERP5/Document/SolverProcess.py index 2da3661c5d..5ca16ad72e 100644 --- a/product/ERP5/Document/SolverProcess.py +++ b/product/ERP5/Document/SolverProcess.py @@ -207,19 +207,29 @@ class SolverProcess(XMLObject, ActiveProcess): # Now build the solver decision instances based on the previous # grouping - # XXX-JPS: pseudocode for update (ie. rebuild) is not present + solver_decision_list = self.objectValues(portal_type='Solver Decision') index = 1 for solver_decision_key, movement_dict in solver_decision_dict.items(): - if temp_object: - new_decision = self.newContent(portal_type='Solver Decision', - temp_object=True, - #id=index, - uid='new_%s' % index) - index += 1 + causality, delivery_list = solver_decision_key + matched_solver_decision_list = [ + x for x in solver_decision_list \ + if x.getDeliveryList() == list(delivery_list) and \ + x.getCausality() == causality] + if len(matched_solver_decision_list) > 0: + solver_decision_list.remove(matched_solver_decision_list[0]) else: - new_decision = self.newContent(portal_type='Solver Decision') - new_decision._setDeliveryList(solver_decision_key[1]) - new_decision._setCausality(solver_decision_key[0]) + if temp_object: + new_decision = self.newContent(portal_type='Solver Decision', + temp_object=True, + #id=index, + uid='new_%s' % index) + index += 1 + else: + new_decision = self.newContent(portal_type='Solver Decision') + new_decision._setDeliveryList(solver_decision_key[1]) + new_decision._setCausality(solver_decision_key[0]) + # XXX what should we do for non-matched existing solver decisions? + # do we need to cancel them by using an appropriate workflow? def _generateRandomId(self): # call ActiveProcess._generateRandomId() explicitly otherwise -- 2.30.9