[Erp5-report] r36849 kazuhiko - /erp5/trunk/products/ERP5/Document/SolverProcess.py

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Mon Jul  5 10:45:15 2010
New Revision: 36849

URL: http://svn.erp5.org?rev=36849&view=rev
Log:
use more accurate comparison to match with existing Solver Decision documents.

Modified:
    erp5/trunk/products/ERP5/Document/SolverProcess.py

Modified: erp5/trunk/products/ERP5/Document/SolverProcess.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SolverProcess.py?rev=36849&r1=36848&r2=36849&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SolverProcess.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SolverProcess.py [utf8] Mon Jul  5 10:45:15 2010
@@ -241,15 +241,17 @@ class SolverProcess(XMLObject, ActivePro
     solver_decision_list = self.objectValues(portal_type='Solver Decision')
     for solver_decision_key, movement_dict in solver_decision_dict.items():
       causality, delivery_list, solver_list = solver_decision_key
+      movement_url_list = [x.getRelativeUrl() for x in movement_dict.keys()]
+      movement_url_list.sort()
       matched_solver_decision_list = [
         x for x in solver_decision_list \
-        if x.getDeliveryValueList() == movement_dict.keys() and \
+        if sorted(x.getDeliveryList()) == movement_url_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._setDeliveryValueList(movement_dict.keys())
+        new_decision._setDeliveryList(movement_url_list)
         new_decision._setCausality(solver_decision_key[0])
         # If we have only one available automatic solver, we just use it
         # automatically.