[Erp5-report] r36749 kazuhiko - in /erp5/trunk/bt5/erp5_base: SkinTemplateItem/portal_skins...

[nobody at svn.erp5.org]

Author: kazuhiko
Date: Wed Jun 30 16:41:06 2010
New Revision: 36749

URL: http://svn.erp5.org?rev=36749&view=rev
Log:
* Reimplement Delivery_solveDivergenceAutomatically by using Solver Process Tool's API instead of ad-hoc way.

Modified:
    erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml
    erp5/trunk/bt5/erp5_base/bt/change_log
    erp5/trunk/bt5/erp5_base/bt/revision

Modified: erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml?rev=36749&r1=36748&r2=36749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/SkinTemplateItem/portal_skins/erp5_base/Delivery_solveDivergenceAutomatically.xml [utf8] Wed Jun 30 16:41:06 2010
@@ -53,41 +53,15 @@
         </item>
         <item>
             <key> <string>_body</string> </key>
-            <value> <string encoding="cdata"><![CDATA[
-
-delivery = context\n
-\n
-portal = delivery.getPortalObject()\n
-solver_tool = portal.portal_solvers\n
-solver_process_tool = portal.portal_solver_processes\n
-\n
-solver_movement_list = []\n
-for tester, simulation_movement in delivery.getDivergentTesterAndSimulationMovementList():\n
-  solver_list = filter(lambda x:x.isAutomaticSolver(),\n
-                       solver_tool.searchTargetSolverList(tester, simulation_movement, automatic_solver_only=True))\n
-  if len(solver_list) == 1:\n
-    solver_movement_list.append((solver_list[0], simulation_movement))\n
-\n
-if len(solver_movement_list) > 0:\n
-  # XXX We sometimes want to store solver process document persistently.\n
-  solver_process = solver_process_tool.newContent(\n
-    portal_type=\'Solver Process\', temp_object=True)\n
-  for solver, simulation_movement in solver_movement_list:\n
-    # XXX Do we need grouping here?\n
-    # XXX Do we need to split activities for each target solver?\n
-    target_solver = solver_process.newContent(\n
-      portal_type=solver.getId(),\n
-      delivery=simulation_movement.getRelativeUrl()\n
-      )\n
-    # Calculate and pass default values.\n
-    target_solver.updateConfiguration(\n
-        **solver.getDefaultConfigurationPropertyDict(target_solver))\n
-  solver_process.solve()\n
-\n
+            <value> <string>delivery = context\n
+solver_process_tool = delivery.getPortalObject().portal_solver_processes\n
+# XXX We sometimes want to store solver process document persistently.\n
+solver_process = solver_process_tool.newSolverProcess(delivery, temp_object=True)\n
+solver_process.buildTargetSolverList()\n
+solver_process.solve()\n
+# XXX It can be required to wait indexing.\n
 delivery.updateCausalityState(solve_automatically=False)\n
-
-
-]]></string> </value>
+</string> </value>
         </item>
         <item>
             <key> <string>_code</string> </key>
@@ -134,22 +108,9 @@ delivery.updateCausalityState(solve_auto
                             <string>context</string>
                             <string>delivery</string>
                             <string>_getattr_</string>
-                            <string>portal</string>
-                            <string>solver_tool</string>
                             <string>solver_process_tool</string>
-                            <string>solver_movement_list</string>
-                            <string>_getiter_</string>
-                            <string>tester</string>
-                            <string>simulation_movement</string>
-                            <string>filter</string>
                             <string>True</string>
-                            <string>solver_list</string>
-                            <string>len</string>
-                            <string>_getitem_</string>
                             <string>solver_process</string>
-                            <string>solver</string>
-                            <string>target_solver</string>
-                            <string>_apply_</string>
                             <string>False</string>
                           </tuple>
                         </value>

Modified: erp5/trunk/bt5/erp5_base/bt/change_log
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/change_log?rev=36749&r1=36748&r2=36749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/change_log [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/change_log [utf8] Wed Jun 30 16:41:06 2010
@@ -1,4 +1,5 @@
 2010-06-30 kazuhiko
+* Reimplement Delivery_solveDivergenceAutomatically by using Solver Process Tool's API instead of ad-hoc way.
 * Move Solver Decision portal type from the experimental erp5_simulation business template to the erp5_base business template.
 * Calculate and pass default values to automatic solvers.
 * Add fallback scripts for target solvers' default configuration values.

Modified: erp5/trunk/bt5/erp5_base/bt/revision
URL: http://svn.erp5.org/erp5/trunk/bt5/erp5_base/bt/revision?rev=36749&r1=36748&r2=36749&view=diff
==============================================================================
--- erp5/trunk/bt5/erp5_base/bt/revision [utf8] (original)
+++ erp5/trunk/bt5/erp5_base/bt/revision [utf8] Wed Jun 30 16:41:06 2010
@@ -1 +1 @@
-785
\ No newline at end of file
+786
\ No newline at end of file