Changeset 2958 in products for quintagroup.seoptimizer/branches/plone4/quintagroup/seoptimizer/browser/keywords.py

Timestamp:

Nov 1, 2010 5:50:32 PM (14 years ago)

Author:

mylan

Message:

Merged 3.0.5 to 3.0.7 changes from trunk into plone-4 branch version.

Merged revisions 3942-3945,3966-3976,3982-3983,3994 via svnmerge from
​http://svn.quintagroup.com/products/quintagroup.seoptimizer/trunk

........

r3942 | mylan | 2010-10-20 17:06:46 +0300 (Wed, 20 Oct 2010) | 1 line

#233: Bump version to 3.0.7, updated history

........

r3943 | olha | 2010-10-20 17:14:52 +0300 (Wed, 20 Oct 2010) | 1 line

HISTORY.txt checked

........

r3944 | olha | 2010-10-20 17:20:15 +0300 (Wed, 20 Oct 2010) | 1 line

internal README file updated

........

r3945 | mylan | 2010-10-20 18:16:14 +0300 (Wed, 20 Oct 2010) | 1 line

#233: Updated list of supported version in README.txt to 3.1+

........

r3966 | mylan | 2010-10-26 17:33:27 +0300 (Tue, 26 Oct 2010) | 1 line

#233: Reduce catch exceptions to URLError and HTTPError, log error to error_log, return link to error_log

........

r3967 | mylan | 2010-10-26 17:34:03 +0300 (Tue, 26 Oct 2010) | 1 line

#233: Update tests for catching errors on keywords calculation

........

r3968 | mylan | 2010-10-26 17:55:15 +0300 (Tue, 26 Oct 2010) | 1 line

#233: Make code more readable

........

r3969 | mylan | 2010-10-26 18:08:15 +0300 (Tue, 26 Oct 2010) | 1 line

#233: Force to get portal_transforms as utility

........

r3970 | mylan | 2010-10-26 18:14:46 +0300 (Tue, 26 Oct 2010) | 1 line

#233: little cleanup

........

r3971 | mylan | 2010-10-26 20:35:28 +0300 (Tue, 26 Oct 2010) | 1 line

#233: Force logging keywords calculation to nearest to context error_log object. Other minor fixes

........

r3972 | mylan | 2010-10-26 21:08:06 +0300 (Tue, 26 Oct 2010) | 1 line

#233: Return getting error_log with getToolByName as more flexible and accurate

........

r3973 | mylan | 2010-10-27 18:09:31 +0300 (Wed, 27 Oct 2010) | 1 line

#233: Correct HISTORY information

........

r3974 | mylan | 2010-10-27 18:16:40 +0300 (Wed, 27 Oct 2010) | 1 line

#233: Added plone.browserlayer to requirements for Plone-3.0 support

........

r3975 | mylan | 2010-10-27 18:18:13 +0300 (Wed, 27 Oct 2010) | 1 line

#233: Fixed testcases to emulate proper test environment for plone-3.0

........

r3976 | mylan | 2010-10-27 18:21:55 +0300 (Wed, 27 Oct 2010) | 1 line

#233: Described steps for use the package with plone-3.0.

........

r3982 | olha | 2010-10-29 13:16:55 +0300 (Fri, 29 Oct 2010) | 1 line

doc files corrected a bit

........

r3983 | olha | 2010-10-29 13:20:45 +0300 (Fri, 29 Oct 2010) | 1 line

wrong line spacing corrected

........

r3994 | mylan | 2010-11-01 16:59:34 +0200 (Mon, 01 Nov 2010) | 1 line

Removed devloper settings of the package configuration

........

Location:

quintagroup.seoptimizer/branches/plone4

Files:

• . (modified) (2 props)
• quintagroup/seoptimizer/browser/keywords.py (modified) (5 diffs)

quintagroup.seoptimizer/branches/plone4

@@ -1 +1 @@
 /quintagroup.seoptimizer/branches/refactoring2.3.0:1776-2133
-/quintagroup.seoptimizer/trunk:2435-2440,2885-2901
+/quintagroup.seoptimizer/trunk:2435-2440,2885-2901,2903-2955

@@ -1 +1 @@
 /quintagroup.seoptimizer/branches/refactoring2.3.0:1776-2133
-/quintagroup.seoptimizer/trunk:2435-2440,2885-2901
+/quintagroup.seoptimizer/trunk:2435-2440,2885-2901,2903-2955

quintagroup.seoptimizer/branches/plone4/quintagroup/seoptimizer/browser/keywords.py

@@ -1 @@
-import re, commands, urllib2
+import re, sys, urllib2
 from xml.dom import Node
 
 from zope.interface import implements
+from zope.component import getUtility
 from zope.component import queryAdapter
-from zope.component import queryMultiAdapter
+
+from Acquisition import aq_acquire
 from Products.Five.browser import BrowserView
 
+from Products.CMFCore.utils import getToolByName
 from Products.CMFPlone.utils import safe_unicode, getSiteEncoding
-from Products.CMFCore.utils import getToolByName
+from Products.PortalTransforms.interfaces import IPortalTransformsTool
 
 from interfaces import IValidateSEOKeywordsView
@@ -22 +25 @@
         text = self.request.get('text')
         ts = getToolByName(self.context, 'translation_service')
-        transforms = getToolByName(self.context, 'portal_transforms')
+        transforms = getUtility(IPortalTransformsTool)
         portal = getToolByName(self.context, 'portal_url').getPortalObject()
         isExternal = queryAdapter(portal, ISEOConfigletSchema).external_keywords_test
@@ -35 +38 @@
                                  context=self.context)
         # Get html page internally or with external request
+        error_url = ""
         if isExternal:
             # Not pass timeout option because:
-            # 1. its value get from the global default timeout settings by default.
+            # 1. its value get from the global default timeout settings.
             # 2. timeout option added in python 2.6 (so acceptable only in plone4+)
             try:
+                resp = urllib2.urlopen(self.context.absolute_url())
                 try:
-                    resp = urllib2.urlopen(self.context.absolute_url())
                     html = resp.read()
                 finally:
-                    'resp' in locals().keys() and resp.close()
-            except Exception:
+                    resp.close()
+            except (urllib2.URLError, urllib2.HTTPError), e:
                 # In case of exceed timeout period or other URL connection errors.
+                # Get nearest to context error_log object (stolen from Zope2/App/startup.py)
                 html = None
+                info = sys.exc_info()
+                elog = getToolByName(self.context, "error_log")
+                error_url = elog.raising(info)
         else:
             html = unicode(self.context()).encode(enc)
@@ -53 +61 @@
         # If no html - information about problem with page retrieval should be returned
         result = []
-        if html is not None:
+        if html is None:
+            result.append("Problem with page retrieval.")
+            if error_url:
+                result.append("Details at %s." % error_url)
+        else:
             page_text = transforms.convert("html_to_text", html).getData()
             # check every keyword on appearing in body of html page
@@ -59 +71 @@
                 keyword_on_page = unicode(len(re.findall(u'\\b%s\\b' % keyword, page_text, re.I|re.U)))
                 result.append(' - '.join((keyword, keyword_on_page)))
-        else:
-            result.append("Problem with page retrieval")
 
         return ts.utranslate(domain='quintagroup.seoptimizer',

@@ -1 +1 @@
 /quintagroup.seoptimizer/branches/refactoring2.3.0:1776-2133
-/quintagroup.seoptimizer/trunk:2435-2440,2885-2901
+/quintagroup.seoptimizer/trunk:2435-2440,2885-2901,2903-2955