Changeset 2169 in products

Timestamp:

Apr 19, 2010 5:37:07 PM (14 years ago)

Author:

mylan

Message:

#135: Force canonical_link usage instead of canonilcal_path

Location:

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser

Files:

• commonview.py (modified) (1 diff)
• utils.py (modified) (2 diffs)

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/commonview.py

@@ -70 +70 @@
             reg_exps)
 
-        purl = self.portal.absolute_url()
         # Prepare dictionary for view
         for url, b in brain_url_map.items():
-            res_map = {'url' : purl+url,}
+            res_map = {'url' : url,}
             [res_map.update({k : f(b)}) for k, f in self.additional_maps]
             result.append(res_map)

quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/utils.py

@@ -6 +6 @@
 from Products.CMFCore.utils import getToolByName
 
-from quintagroup.canonicalpath.interfaces import ICanonicalPath
+from quintagroup.canonicalpath.interfaces import ICanonicalLink
 import quintagroup.plonegooglesitemaps.config as config
 
@@ -26 +26 @@
     for ob in objects:
         url = _marker
-        if ob.has_key('canonical_path'):
-            url = ob.canonical_path
+        if ob.has_key('canonical_link'):
+            url = ob.canonical_link
         if url in [Missing_Value, _marker]:
-            cpath = queryAdapter(ob.getObject(), ICanonicalPath)
-            url = cpath.canonical_path()
+            url = ICanonicalLink(ob.getObject()).canonical_link
         for operator, what, with in operations:
             url = OPERATORS[operator](url, what, with.replace("\\", ""))