Changeset 1726 in products

Timestamp:

Feb 12, 2010 1:06:33 PM (14 years ago)

Author:

mylan

Message:

Updated getting canonical_path data for sitemap record (use ICacnonicalPath adapter as fallback)

File:

• quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/utils.py (modified) (3 diffs)

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

@@ -1 +1 @@
 import re
+from zope.component import queryAdapter
 
 from DateTime import DateTime
+from Missing import MV as Missing_Value
+from Products.CMFCore.utils import getToolByName
 
-from Products.CMFCore.utils import getToolByName
+from quintagroup.canonicalpath.interfaces import ICanonicalPath
 import quintagroup.plonegooglesitemaps.config as config
 
@@ -9 +12 @@
 ADD_PLONE = re.compile('^[^http://|https://|\\\]')
 OPERATIONS_PARSE = re.compile(r"(.?[^\\])/(.*[^\\]|)/(.*[^\\]|)/")
+_marker = []
 
 def searchAndReplace(string, what, with):
@@ -21 +25 @@
     result = {}
     for ob in objects:
+        url = _marker
         if ob.has_key('canonical_path'):
             url = ob.canonical_path
-        else:
-            url = '/'+'/'.join(ob.getPath().split('/')[2:])
+        if url in [Missing_Value, _marker]:
+            cpath = queryAdapter(ob.getObject(), ICanonicalPath)
+            url = cpath.canonical_path()
         for operator, what, with in operations:
             url = OPERATORS[operator](url, what, with.replace("\\", ""))