[Erp5-report] r34003 kazuhiko - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Tue Mar 23 14:22:31 2010
New Revision: 34003

URL: http://svn.erp5.org?rev=34003&view=rev
Log:
no need to propagate changes to upper level.

Modified:
    erp5/trunk/products/ERP5/Document/AcceptSolver.py
    erp5/trunk/products/ERP5/Document/UnifySolver.py

Modified: erp5/trunk/products/ERP5/Document/AcceptSolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AcceptSolver.py?rev=34003&r1=34002&r2=34003&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/AcceptSolver.py [utf8] Tue Mar 23 14:22:31 2010
@@ -85,25 +85,10 @@
             value_dict.update({'quantity':new_quantity})
           else:
             value_dict.update({solved_property:new_value})
-        self._solveRecursively(simulation_movement, value_dict)
+        for property_id, value in value_dict.iteritems():
+          if not simulation_movement.isPropertyRecorded(property_id):
+            simulation_movement.recordProperty(property_id)
+          simulation_movement.setMappedProperty(property_id, value)
         simulation_movement.expand()
     # Finish solving
     self.succeed()
-
-  def _solveRecursively(self, simulation_movement, value_dict=None):
-    """
-      Update value of the current simulation movement, and update
-      his parent movement.
-    """
-    applied_rule = simulation_movement.getParentValue()
-    parent_movement = applied_rule.getParentValue()
-    if parent_movement.getPortalType() == 'Simulation Movement' and \
-           not parent_movement.isFrozen():
-      # backtrack to the parent movement while it is not frozen
-      self._solveRecursively(parent_movement, value_dict=value_dict)
-    else:
-      for property_id in value_dict.iterkeys():
-        if not simulation_movement.isPropertyRecorded(property_id):
-          simulation_movement.recordProperty(property_id)
-    for property_id, value in value_dict.iteritems():
-      simulation_movement.setMappedProperty(property_id, value)

Modified: erp5/trunk/products/ERP5/Document/UnifySolver.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/UnifySolver.py?rev=34003&r1=34002&r2=34003&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/UnifySolver.py [utf8] Tue Mar 23 14:22:31 2010
@@ -80,7 +80,10 @@
            for x in self.getDeliveryValue().getMovementList()], [])
       for simulation_movement in simulation_movement_list:
         value_dict = {solved_property:new_value}
-        self._solveRecursively(simulation_movement, value_dict)
+        for property_id, value in value_dict.iteritems():
+          if not simulation_movement.isPropertyRecorded(property_id):
+            simulation_movement.recordProperty(property_id)
+          simulation_movement.setMappedProperty(property_id, value)
         simulation_movement.expand()
     # Finish solving
     self.succeed()