Changeset 1671 in products for quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/views.py

Timestamp:

Feb 9, 2010 12:59:27 PM (14 years ago)

Author:

mylan

Message:

Added ICanonicalPath adapter and appropriate tests

File:

• quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/views.py (modified) (2 diffs)

quintagroup.seoptimizer/trunk/quintagroup/seoptimizer/browser/views.py

@@ -11 +11 @@
 
 from quintagroup.seoptimizer import SeoptimizerMessageFactory as _
+from quintagroup.seoptimizer import interfaces
 
 SEPERATOR = '|'
-HAS_CANONICAL_PATH = True
 SEO_PREFIX = 'seo_'
 PROP_PREFIX = 'qSEO_'
 SUFFIX = '_override'
 PROP_CUSTOM_PREFIX = 'qSEO_custom_'
-
-try:
-    from quintagroup.canonicalpath.interfaces import ICanonicalPath
-except ImportError:
-    HAS_CANONICAL_PATH = False
 
 class SEOContext( BrowserView ):
@@ -213 +208 @@
         """ Generate canonical URL from SEO properties.
         """
-        canonical = self.getSEOProperty( 'qSEO_canonical' )
-
-        if not canonical and HAS_CANONICAL_PATH:
-            canpath = queryAdapter(self.context, ICanonicalPath)
-            if canpath:
-                purl = getToolByName(self.context, 'portal_url')()
-                cpath = canpath.canonical_path()
-                canonical = purl + cpath
-
-        return canonical and canonical or self.context.absolute_url()
+        purl = getToolByName(self.context, 'portal_url')()
+        canpath = queryAdapter(self.context, interfaces.ICanonicalPath,
+            name='qseo_canonical')
+        return purl + canpath.canonical_path()