[Erp5-report] r10486 - /erp5/trunk/products/ERP5OOo/Document/ExternalDocument.py

[nobody at svn.erp5.org]

Author: bartek
Date: Mon Oct  2 16:24:20 2006
New Revision: 10486

URL: http://svn.erp5.org?rev=10486&view=rev
Log:
pass on urlinfo object, so that processData can make some decisions

Modified:
    erp5/trunk/products/ERP5OOo/Document/ExternalDocument.py

Modified: erp5/trunk/products/ERP5OOo/Document/ExternalDocument.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5OOo/Document/ExternalDocument.py?rev=10486&r1=10485&r2=10486&view=diff
==============================================================================
--- erp5/trunk/products/ERP5OOo/Document/ExternalDocument.py (original)
+++ erp5/trunk/products/ERP5OOo/Document/ExternalDocument.py Mon Oct  2 16:24:20 2006
@@ -101,10 +101,11 @@
     op=Opener()
     f=op.open(self.getQualifiedUrl())
     s=f.read()
-    return s
+    inf=f.info()
+    return s, inf
 
   security.declarePrivate('_processData')
-  def _processData(self,s):
+  def _processData(self,s, inf):
     raise Exception('this should be implemented in subclass')
 
   security.declareProtected(Permissions.ModifyPortalContent,'resetTopObject')
@@ -124,7 +125,7 @@
     returned value tells us if it succeeded or failed
     """
     try:
-      s=self._spiderSource()
+      s,inf=self._spiderSource()
     except Exception,e:
       self.log(e,level=1)
       self.setStatusMessage("Tried on %s: %s" % (self._time(),str(e)))
@@ -134,7 +135,7 @@
       self.setStatusMessage("Tried on %s: got empty string" % self._time())
       return False
     try:
-      s=self._processData(s)
+      s=self._processData(s,inf)
     except Exception,e:
       self.log(e,level=1)
       self.setStatusMessage("Spidered on %s, %i chars, but could not process; reason: %s" % (self._time(), chars, str(e)))