[Erp5-report] r35972 nicolas.dumazet - /erp5/trunk/products/ERP5/Document/SupplyChain.py

[nobody at svn.erp5.org]

Author: nicolas.dumazet
Date: Fri Jun  4 04:34:19 2010
New Revision: 35972

URL: http://svn.erp5.org?rev=35972&view=rev
Log:
continue_recursivity variable was just unneeded, difficult to read trickery

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

Modified: erp5/trunk/products/ERP5/Document/SupplyChain.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SupplyChain.py?rev=35972&r1=35971&r2=35972&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SupplyChain.py [utf8] (original)
+++ erp5/trunk/products/ERP5/Document/SupplyChain.py [utf8] Fri Jun  4 04:34:19 2010
@@ -188,9 +188,12 @@
       previous_link_list = self.getPreviousSupplyLinkList(current_supply_link)
       # Test each link
       for previous_link in previous_link_list:
-        continue_recursivity = False
-        # Great, we find a valid one
-        if previous_link.isProductionSupplyLink():
+        if not previous_link.isProductionSupplyLink():
+          # current is invalid
+          if not recursive:
+            continue
+        else:
+          # Great, we found a valid one
           transformation_link_list.append(previous_link)
           # Prevent infinite loop when 2 production_link have the same
           # destination
@@ -200,19 +203,15 @@
                   "Those SupplyLinks are in conflict: %r and %r" %\
                   (current_supply_link.getRelativeUrl(),\
                    previous_link.getRelativeUrl())
-          if all:
-            continue_recursivity = True
-        # Reject the current
-        elif recursive:
-          continue_recursivity = True
-        # Continue to browse the chain ?
-        if continue_recursivity:
-          # Browse the previous link
-          transformation_link_list.extend(
-            self.getPreviousProductionSupplyLinkList(
-                                         previous_link, 
-                                         recursive=recursive, all=all,
-                                         checked_link_list=checked_link_list))
+          if not recursive and not all:
+            continue
+
+        # Browse the previous link
+        transformation_link_list.extend(
+          self.getPreviousProductionSupplyLinkList(
+                                       previous_link, 
+                                       recursive=recursive, all=all,
+                                       checked_link_list=checked_link_list))
       # Return result
       return transformation_link_list