[Erp5-report] r7707 - /erp5/trunk/products/ERP5/Document/

[nobody at svn.erp5.org]

Author: jerome
Date: Tue Jun 13 16:32:06 2006
New Revision: 7707

URL: http://svn.erp5.org?rev=7707&view=rev
Log:
Remove getMovementIndex


Modified:
    erp5/trunk/products/ERP5/Document/AppliedRule.py
    erp5/trunk/products/ERP5/Document/SimulationMovement.py

Modified: erp5/trunk/products/ERP5/Document/AppliedRule.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/AppliedRule.py?rev=7707&r1=7706&r2=7707&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/AppliedRule.py (original)
+++ erp5/trunk/products/ERP5/Document/AppliedRule.py Tue Jun 13 16:32:06 2006
@@ -180,26 +180,6 @@
         return rule.getSolverList(self)
       return ()
 
-    # Optimized Reindexing
-    security.declareProtected(Permissions.View, 'getMovementIndex')
-    def getMovementIndex(self):
-      """
-        Returns a list of indexable movements
-      """
-      result = [ { 'uid'                        : self.getUid(),
-                   'id'                         : self.getId(),
-                   'portal_type'                : self.getPortalType(),
-                   'url'                        : self.getUrl(),
-                   'relative_url'               : self.getRelativeUrl(),
-                   'parent_uid'                 : self.getParentUid(),
-                   'simulation_state'           : None,
-                   'causality_uid'              : self.getCausalityUid(),
-                   'specialise_uid'             : self.getSpecialiseUid(),
-                  } ]
-      for m in self.objectValues():
-        result.extend(m.getMovementIndex())
-      return result
-
     security.declareProtected(Permissions.AccessContentsInformation,
                               'isRootAppliedRule')
     def isRootAppliedRule(self):
@@ -217,9 +197,6 @@
       if self.getParentValue().getMetaType() == "ERP5 Simulation Tool":
         return self
       return self.getParentValue().getRootAppliedRule()
-
-    # Psyco optimizations
-    psyco.bind(getMovementIndex)
 
     security.declareProtected(Permissions.ModifyPortalContent,
                               'notifySimulationChange')

Modified: erp5/trunk/products/ERP5/Document/SimulationMovement.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/Document/SimulationMovement.py?rev=7707&r1=7706&r2=7707&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/Document/SimulationMovement.py (original)
+++ erp5/trunk/products/ERP5/Document/SimulationMovement.py Tue Jun 13 16:32:06 2006
@@ -251,52 +251,6 @@
     self.setCausalityState('diverged')
 
   #diverge = WorkflowMethod(diverge) USELESS NOW
-
-  # isDivergent is defined in movement
-
-  # Optimized Reindexing
-  security.declareProtected( Permissions.AccessContentsInformation,
-                             'getMovementIndex')
-  def getMovementIndex(self):
-    """
-      Returns a list of indexable movements
-    """
-    result = [ { 'uid'                            : self.getUid(),
-                 'id'                             : self.getId(),
-                 'portal_type'                    : self.getPortalType(),
-                 'url'                            : self.getUrl(),
-                 'relative_url'                   : self.getRelativeUrl(),
-                 'parent_uid'                     : self.getParentUid(),
-                 'simulation_state'               : self.getSimulationState(),
-                 'order_uid'                      : self.getOrderUid(),
-                 'explanation_uid'                : self.getExplanationUid(),
-                 #'delivery_uid'                   : self.getDeliveryUid(),
-                 'source_uid'                     : self.getSourceUid(),
-                 'destination_uid'                : self.getDestinationUid(),
-                 'source_section_uid'             : self.getSourceSectionUid(),
-                 'destination_section_uid'        : self.getDestinationSectionUid(),
-                 'resource_uid'                   : self.getResourceUid(),
-                 'quantity'                       : self.getNetConvertedQuantity(),
-                 'start_date'                     : self.getStartDate(),
-                 'stop_date'                      : self.getStopDate(),
-                 'target_quantity'                : self.getNetConvertedTargetQuantity(),
-                 'target_start_date'              : self.getTargetStartDate(),
-                 'target_stop_date'               : self.getTargetStopDate(),
-                 'price'                          : self.getPrice(),
-                 'total_price'                    : self.getTotalPrice(),
-                 'target_total_price'             : self.getTargetTotalPrice(),
-                 'has_cell_content'               : 0,
-                 'accountable'                    : self.isAccountable(),
-                 'orderable'                      : self.isOrderable(),
-                 'deliverable'                    : self.isDeliverable(),
-                 'variation_text'                 : self.getVariationText(),
-                 'inventory'                      : self.getInventoriatedQuantity(),
-                 'source_asset_price'             : self.getSourceAssetPrice(),
-                 'destination_asset_price'        : self.getDestinationAssetPrice(),
-                } ]
-    for m in self.objectValues():
-      result.extend(m.getMovementIndex())
-    return result
 
   security.declareProtected( Permissions.AccessContentsInformation,
                              'getExplanation')