[Erp5-report] r7248 - in /erp5/trunk/products/CMFActivity: ActiveResult.py ActivityTool.py

[nobody at svn.erp5.org]

Author: jp
Date: Fri May 12 14:58:17 2006
New Revision: 7248

URL: http://svn.erp5.org?rev=7248&view=rev
Log:
Move Error class from ERP5Type to CMFActivity.ActiveResult since this is a Result instance for an active process rather than an error.

Added:
    erp5/trunk/products/CMFActivity/ActiveResult.py
Modified:
    erp5/trunk/products/CMFActivity/ActivityTool.py

Added: erp5/trunk/products/CMFActivity/ActiveResult.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActiveResult.py?rev=7248&view=auto
==============================================================================
--- erp5/trunk/products/CMFActivity/ActiveResult.py (added)
+++ erp5/trunk/products/CMFActivity/ActiveResult.py Fri May 12 14:58:17 2006
@@ -1,0 +1,98 @@
+##############################################################################
+#
+# Copyright (c) 2004 Nexedi SARL and Contributors. All Rights Reserved.
+#                    Sebastien Robin <seb at nexedi.com>
+#
+# WARNING: This program as such is intended to be used by professional
+# programmers who take the whole responsability of assessing all potential
+# consequences resulting from its eventual inadequacies and bugs
+# End users who are looking for a ready-to-use solution with commercial
+# garantees and support are strongly adviced to contract a Free Software
+# Service Company
+#
+# This program is Free Software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+#
+##############################################################################
+
+from Products.ERP5Type.Base import Base
+from Products.ERP5Type.Utils import getPath
+from zLOG import LOG
+from Globals import InitializeClass, DTMLFile
+from Products.PythonScripts.Utility import allow_class
+
+class ActiveResult:
+  """
+    Encapsulates the result of deferred activity.
+    This class is used by processes to store results
+    (and eventually, errors)
+  """
+
+  # Standard severities
+  TRACE   = -300
+  DEBUG   = -200
+  BLATHER = -100
+  INFO    =    0
+  PROBLEM =  100
+  WARNING =  100
+  ERROR   =  200
+  PANIC   =  300
+
+  def __init__(self,summary='',severity=INFO,detail='',**kw):
+    """
+    set all parameters
+    """
+    if kw.has_key('object_path'):
+      self.object_path = getPath(kw['object_path'],tuple=1)
+      del kw['object_path']
+    self.summary = summary
+    self.severity = severity
+    self.detail = detail
+    self.__dict__.update(kw)
+
+  def edit(self,**kw):
+    """
+    set all parameters
+    """
+    if kw.has_key('object_path'):
+      self.object_path = getPath(kw['object_path'],tuple=1)
+      del kw['object_path']
+    self.__dict__.update(kw)
+
+  def getProperty(self,value):
+    """
+    A simple getter
+    """
+    return getattr(self,value,None)
+
+  def getResult(self):
+    """
+    Returns the result
+    """
+    return self.result
+
+  def isResult(self):
+    """
+    Tells if the result is a result or an error
+    """
+    return self.severity <= self.INFO
+
+  def isError(self):
+    """
+    Tells if the result is a result or an error
+    """
+    return self.severity > self.INFO
+
+
+allow_class(ActiveResult)

Modified: erp5/trunk/products/CMFActivity/ActivityTool.py
URL: http://svn.erp5.org/erp5/trunk/products/CMFActivity/ActivityTool.py?rev=7248&r1=7247&r2=7248&view=diff
==============================================================================
--- erp5/trunk/products/CMFActivity/ActivityTool.py (original)
+++ erp5/trunk/products/CMFActivity/ActivityTool.py Fri May 12 14:58:17 2006
@@ -36,7 +36,7 @@
 
 from Products.CMFCore import CMFCorePermissions
 from Products.ERP5Type.Document.Folder import Folder
-from Products.ERP5Type.Error import Error
+from Products.CMFActivity.ActiveResult import ActiveResult
 from Products.PythonScripts.Utility import allow_class
 from AccessControl import ClassSecurityInfo, Permissions
 from AccessControl.SecurityManagement import newSecurityManager, noSecurityManager
@@ -155,14 +155,14 @@
   def activateResult(self, activity_tool, result, object):
     if self.active_process is not None:
       active_process = activity_tool.unrestrictedTraverse(self.active_process)
-      if isinstance(result,Error):
+      if isinstance(result,ActiveResult):
         result.edit(object_path=object)
         result.edit(method_id=self.method_id)
         # XXX Allow other method_id in future
         active_process.activateResult(result)
       else:
         active_process.activateResult(
-                    Error(object_path=object,
+                    ActiveResult(object_path=object,
                           method_id=self.method_id,
                           result=result)) # XXX Allow other method_id in future