Changeset 2923 in products

Timestamp:

Oct 25, 2010 2:38:55 PM (14 years ago)

Author:

mylan

Message:

#228: Fixed default Path filter

File:

• quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/utilities.py (modified) (2 diffs)

quintagroup.plonegooglesitemaps/branches/blacklist/quintagroup/plonegooglesitemaps/utilities.py

@@ -1 +1 @@
 from zope.interface import implements
+from zope.component import queryMultiAdapter
 from quintagroup.plonegooglesitemaps.interfaces import IBlackoutFilterUtility
 
@@ -19 +20 @@
     def filterOut(self, fdata, fkey, **kwargs):
         """Filter-out fdata list by path in fkey."""
+        sm = kwargs.get("sitemap", None)
+        req = kwargs.get("request", None)
         if fkey.startswith("/"):
             # absolute path filter
-            return [b for b in fdata if b.getPath() != fkey]
+            # portal_state = getMultiAdapter((self.context, self.request), name=u'plone_portal_state')
+            portal = queryMultiAdapter((sm, req), name=u"plone_portal_state").portal()
+            return [b for b in fdata if b.getPath() != '/%s%s' % (portal.getId(), fkey)]
         elif fkey.startswith("./"):
             # relative path filter
-            smpath = kwargs.get("sitemap")
-            contpath = '/'.join(smpath.getPhysicalPath()[:-1])
-            resfilter = contpath + fkey[1:]
-            return [b for b in fdata if b.getPath() != resfilter]
+            contpath = '/'.join(sm.getPhysicalPath()[:-1])
+            return [b for b in fdata if b.getPath() != (contpath + fkey[1:])]
         return fdata