fixed workflow status implementation

git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@12199 20353a03-c40f-0410-a6d1-a30d3c3de9de

product/ERP5/Document/ExternalDocument.py

@@ -29,8 +29,11 @@ from AccessControl import ClassSecurityInfo
 from Products.CMFCore.WorkflowCore import WorkflowMethod
 from Products.ERP5Type import Permissions, PropertySheet, Constraint, Interface
 from Products.ERP5.Document.Document import Document
+from Products.CMFCore.utils import getToolByName
 
-import mimetypes, re, urllib
+import mimetypes
+import re
+import urllib
 from htmlentitydefs import name2codepoint
 from DateTime import DateTime
 
@@ -123,6 +126,7 @@ class ExternalDocument(Document):
     sets status message
     returned value tells us if it succeeded or failed
     """
+    portal_workflow = getToolByName(self, 'portal_workflow')
     try:
       s,inf=self._spiderSource()
     except Exception,e:

product/ERP5/Document/ExternalWebPage.py

@@ -35,8 +35,6 @@ from Products.CMFCore.utils import getToolByName
 import mimetypes, re, urllib
 from htmlentitydefs import name2codepoint
 
-portal_workflow = getToolByName('portal_workflow')
-
 rx=[]
 rx.append(re.compile('<!--.*?-->',re.DOTALL|re.MULTILINE)) # clear comments (sometimes JavaScript code in comments contains > chars)
 rx.append(re.compile('<[^>]*?>',re.DOTALL|re.MULTILINE)) # clear tags
@@ -206,6 +204,7 @@ class ExternalWebPage(ExternalDocument):
       s=recode(s)
     except CanNotDecode:
       msg = "Spidered on %s, %i chars, but could not decode" % (self._time(), chars)
+      portal_workflow = getToolByName(self, 'portal_workflow')
       portal_workflow.doActionFor(context, 'process', comment=msg)
       return False
     s=stripHtml(s) # remove headers, doctype and the like