Changeset 2169 in products for quintagroup.plonegooglesitemaps/trunk/quintagroup
- Timestamp:
- Apr 19, 2010 5:37:07 PM (14 years ago)
- Location:
- quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/commonview.py
r1593 r2169 70 70 reg_exps) 71 71 72 purl = self.portal.absolute_url()73 72 # Prepare dictionary for view 74 73 for url, b in brain_url_map.items(): 75 res_map = {'url' : purl+url,}74 res_map = {'url' : url,} 76 75 [res_map.update({k : f(b)}) for k, f in self.additional_maps] 77 76 result.append(res_map) -
quintagroup.plonegooglesitemaps/trunk/quintagroup/plonegooglesitemaps/browser/utils.py
r1726 r2169 6 6 from Products.CMFCore.utils import getToolByName 7 7 8 from quintagroup.canonicalpath.interfaces import ICanonical Path8 from quintagroup.canonicalpath.interfaces import ICanonicalLink 9 9 import quintagroup.plonegooglesitemaps.config as config 10 10 … … 26 26 for ob in objects: 27 27 url = _marker 28 if ob.has_key('canonical_ path'):29 url = ob.canonical_ path28 if ob.has_key('canonical_link'): 29 url = ob.canonical_link 30 30 if url in [Missing_Value, _marker]: 31 cpath = queryAdapter(ob.getObject(), ICanonicalPath) 32 url = cpath.canonical_path() 31 url = ICanonicalLink(ob.getObject()).canonical_link 33 32 for operator, what, with in operations: 34 33 url = OPERATORS[operator](url, what, with.replace("\\", ""))
Note: See TracChangeset
for help on using the changeset viewer.