[Checkins] SVN: Products.CMFTopic/trunk/Products/CMFTopic/ - revert this to getToolByName until the issues are resolved

[Yvo Schubbe]

Log message for revision 122827:
  - revert this to getToolByName until the issues are resolved

Changed:
  U   Products.CMFTopic/trunk/Products/CMFTopic/Topic.py
  U   Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py

-=-
Modified: Products.CMFTopic/trunk/Products/CMFTopic/Topic.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/Topic.py	2011-09-16 13:45:42 UTC (rev 122826)
+++ Products.CMFTopic/trunk/Products/CMFTopic/Topic.py	2011-09-16 13:48:27 UTC (rev 122827)
@@ -22,6 +22,7 @@
 
 from Products.CMFCore.interfaces import ICatalogTool
 from Products.CMFCore.interfaces import ISyndicationTool
+from Products.CMFCore.utils import getToolByName
 from Products.CMFDefault.SkinnedFolder import SkinnedFolder
 from Products.CMFTopic.interfaces import IMutableTopic
 from Products.CMFTopic.interfaces import ITopic
@@ -138,7 +139,9 @@
         o Built-in criteria update any criteria passed in 'kw'.
         """
         kw.update(self.buildQuery())
-        ctool = getUtility(ICatalogTool)
+# XXX: fix this
+#        ctool = getUtility(ICatalogTool)
+        ctool = getToolByName(self, 'portal_catalog')
         return ctool.searchResults(REQUEST, **kw)
 
     security.declareProtected(View, 'synContentValues')

Modified: Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py
===================================================================
--- Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py	2011-09-16 13:45:42 UTC (rev 122826)
+++ Products.CMFTopic/trunk/Products/CMFTopic/tests/test_Topic.py	2011-09-16 13:48:27 UTC (rev 122827)
@@ -143,7 +143,8 @@
 
     def _initSite(self, max_items=15, index_ids=()):
         sm = getSiteManager()
-        sm.registerUtility(DummyCatalog(index_ids), ICatalogTool)
+        self.site.portal_catalog = DummyCatalog(index_ids)
+        sm.registerUtility(self.site.portal_catalog, ICatalogTool)
         sm.registerUtility(DummySyndicationTool(max_items), ISyndicationTool)
 
     def _initDocuments(self, **kw):