Changeset 1981 in products for quintagroup.catalogupdater/trunk/quintagroup
- Timestamp:
- Mar 24, 2010 9:52:44 AM (14 years ago)
- Location:
- quintagroup.catalogupdater/trunk/quintagroup/catalogupdater
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
quintagroup.catalogupdater/trunk/quintagroup/catalogupdater/exportimport/tests/test_catalogupdate.py
r1761 r1981 15 15 from quintagroup.catalogupdater.interfaces import ICatalogUpdater 16 16 17 from Products.CMFPlone.utils import getFSVersionTuple 18 PLONEFOUR = getFSVersionTuple()[0] == 4 and True or False 19 17 20 _CATALOG_BODY = test_exportimport._CATALOG_BODY 18 21 _ZCTEXT_XML = test_exportimport._ZCTEXT_XML … … 21 24 <?xml version="1.0"?> 22 25 <object name="foo_catalog"> 23 <object name="foo_vocabulary" remove="True"/>26 %s 24 27 <index name="foo_text" remove="True"/> 25 28 <index name="foo_text" meta_type="ZCTextIndex"> … … 34 37 <column value="spam" update="True"/> 35 38 </object> 36 """ 39 """ % (PLONEFOUR and '<object name="old_plexicon" remove="True"/>' or \ 40 '<object name="foo_vocabulary" remove="True"/>') 41 37 42 38 43 -
quintagroup.catalogupdater/trunk/quintagroup/catalogupdater/utility.py
r1865 r1981 12 12 from Products.ZCatalog.Catalog import safe_callable 13 13 14 15 14 try: 16 15 from plone.indexer.interfaces import IIndexableObject 17 16 except ImportError: 18 class IIndexableObject:pass19 17 from plone.app.content.interfaces import IIndexableObjectWrapper \ 20 18 as _old_IIndexableObjectWrapper 21 from plone.app.content.interfaces import IIndexableObjectWrapper22 23 register_bbb_indexers = lambda:None24 25 19 IS_NEW = False 26 20 else: 27 from Products.CMFPlone.CatalogTool import register_bbb_indexers28 from Products.CMFPlone.CatalogTool import _old_IIndexableObjectWrapper29 30 21 IS_NEW = True 31 22 … … 64 55 def getWrappedObjectNew(self, obj, portal, catalog): 65 56 # Returned wrapped 'obj' object with IIndexable wrapper 66 w = obj57 wrapper = None 67 58 if not IIndexableObject.providedBy(obj): 68 # BBB: Compatibility wrapper lookup. Should be removed in Plone 4. 69 register_bbb_indexers() 70 wrapper = queryMultiAdapter((obj, portal), _old_IIndexableObjectWrapper) 71 if wrapper is not None: 72 w = wrapper 73 else: 74 # This is the CMF 2.2 compatible approach, which should be used going forward 75 wrapper = queryMultiAdapter((obj, catalog), IIndexableObject) 76 if wrapper is not None: 77 w = wrapper 78 return w 79 59 # This is the CMF 2.2 compatible approach, which should be used going forward 60 wrapper = queryMultiAdapter((obj, catalog), IIndexableObject) 61 return wrapper and wrapper or obj 80 62 81 63 def getWrappedObjectOld(self, obj, portal, catalog):
Note: See TracChangeset
for help on using the changeset viewer.