[Erp5-report] r35147 jerome - /erp5/trunk/products/ERP5/Document/SolverProcess.py

[nobody at svn.erp5.org]

Author: jerome
Date: Mon May 10 19:04:08 2010
New Revision: 35147

URL: http://svn.erp5.org?rev=35147&view=rev
Log:
get solver tool from its new location, and minor updates

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=35147&r1=35146&r2=35147&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SolverProcess.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SolverProcess.py [utf8] Mon May 10 19:04:08 2010
@@ -81,7 +81,6 @@
       Builds target solvers from solver decisions
     """
     movement_dict = {}
-    types_tool = self.portal_types
     message_list = []
 
     # First create a mapping between delivery movements and solvers
@@ -154,8 +153,9 @@
           if configuration_mapping not in movement_solver_configuration_list:
             movement_solver_configuration_list.append(configuration_mapping)
 
-    # Return empty list of conflicts
-    if message_list: return message_list
+    # If conflicts where detected, return them and do nothing
+    if message_list:
+      return message_list
 
     # Fourth, build target solvers
     for solver, solver_key_dict in grouped_solver_dict.items():
@@ -216,7 +216,7 @@
     # delivery lines. Let us group decisions in such way
     # that a single decision is created per divergence tester instance
     # and per application level list
-    solver_tool = self.getParentValue()
+    solver_tool = self.getPortalObject().portal_solvers
     solver_decision_dict = {}
     for movement in movement_list:
       for simulation_movement in movement.getDeliveryRelatedValueList():